Changeset 21846 in osm for applications

Timestamp:

2010-06-21T15:53:53+02:00 (15 years ago)

Author:

upliner

Message:

Allow th snap an angle to ways and to rotate the crosshair

(features has been requested by Komzpa)

Location:

applications/editors/josm/plugins/buildings_tools/src/buildings_tools

Files:

• AdvancedSettingsDialog.java (modified) (3 diffs)
• AngleSnap.java (added)
• Building.java (modified) (8 diffs)
• BuildingSizeAction.java (modified) (1 diff)
• BuildingSizeDialog.java (modified) (2 diffs)
• DrawBuildingAction.java (modified) (12 diffs)
• ToolSettings.java (modified) (3 diffs)

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java

@@ -18 +18 @@
         JTextField tBTag = new JTextField();
         JCheckBox cBigMode = new JCheckBox(tr("Big buildings mode"));
+        JCheckBox cSoftCur = new JCheckBox(tr("Rotate crosshair"));
 
         public AdvancedSettingsDialog() {
@@ -29 +30 @@
                 addLabelled(panel, tr("Building tag:"), tBTag);
                 panel.add(cBigMode, GBC.eol().fill(GBC.HORIZONTAL));
+                panel.add(cSoftCur, GBC.eol().fill(GBC.HORIZONTAL));
 
                 tBTag.setText(ToolSettings.getTag());
                 cBigMode.setSelected(ToolSettings.isBBMode());
+                cSoftCur.setSelected(ToolSettings.isSoftCursor());
 
                 setContent(panel);
@@ -45 +48 @@
                 return cBigMode.isSelected();
         }
+
+        public boolean isSoftCursor() {
+                return cSoftCur.isSelected();
+        }
+
+        public void saveSettings() {
+                ToolSettings.setTag(getTag());
+                ToolSettings.setBBMode(isBBMode());
+                ToolSettings.setSoftCursor(isSoftCursor());
+        }
 }

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/Building.java

@@ -36 +36 @@
         private double width;
         private double heading;
-        private boolean angConstrained;
-        private double angConstraint = 0;
-
-        public void disableAngConstraint() {
-                angConstrained = false;
-        }
-
-        public void setAngConstraint(double angle) {
-                angConstrained = true;
-                angConstraint = angle;
+        private AngleSnap angleSnap = new AngleSnap();
+        private Double drawingAngle;
+
+        public void clearAngleSnap() {
+                angleSnap.clear();
+                drawingAngle = null;
+        }
+
+        public void addAngleSnap(Node[] nodes) {
+                drawingAngle = angleSnap.addSnap(nodes);
+        }
+
+        public void addAngleSnap(Way way) {
+                angleSnap.addSnap(way);
+                if (drawingAngle == null) {
+                        drawingAngle = angleSnap.getAngle();
+                }
         }
 
@@ -57 +64 @@
 
         public boolean isRectDrawing() {
-                return angConstrained && ToolSettings.getWidth() == 0 && ToolSettings.getLenStep() == 0;
+                return drawingAngle != null && ToolSettings.getWidth() == 0 && ToolSettings.getLenStep() == 0;
+        }
+
+        public Double getDrawingAngle() {
+                return drawingAngle;
         }
 
@@ -108 +119 @@
                 final EastNorth p1 = en[0];
                 en[1] = new EastNorth(p1.east() + Math.sin(heading) * len * meter, p1.north() + Math.cos(heading) * len * meter);
-                en[2] = new EastNorth(p1.east() + Math.sin(heading) * len * meter + Math.cos(heading) * width * meter, p1
-                                .north()
-                                + Math.cos(heading) * len * meter - Math.sin(heading) * width * meter);
-                en[3] = new EastNorth(p1.east() + Math.cos(heading) * width * meter, p1.north() - Math.sin(heading) * width
-                                * meter);
+                en[2] = new EastNorth(p1.east() + Math.sin(heading) * len * meter + Math.cos(heading) * width * meter,
+                                p1.north() + Math.cos(heading) * len * meter - Math.sin(heading) * width * meter);
+                en[3] = new EastNorth(p1.east() + Math.cos(heading) * width * meter,
+                                p1.north() - Math.sin(heading) * width  * meter);
         }
 
@@ -130 +140 @@
                         throw new IllegalStateException("setPlace() called without the base point");
                 this.heading = en[0].heading(p2);
-                double hdang = 0;
-                if (angConstrained && !ignoreConstraints) {
-                        hdang = Math.round((heading - angConstraint) / Math.PI * 4);
-                        hdang = hdang % 8;
-                        if (hdang < 0)
-                                hdang += 8;
-                        heading = (hdang * Math.PI / 4 + angConstraint) % (2 * Math.PI);
-                }
+                if (!ignoreConstraints)
+                        this.heading = angleSnap.snapAngle(this.heading);
 
                 this.width = width;
@@ -147 +151 @@
 
                 Main.map.statusLine.setHeading(Math.toDegrees(heading));
-                if (angConstrained && !ignoreConstraints) {
-                        Main.map.statusLine.setAngle(hdang * 45);
+                if (this.drawingAngle != null && !ignoreConstraints) {
+                        double ang = Math.toDegrees(heading - this.drawingAngle);
+                        if (ang < 0)
+                                ang += 360;
+                        if (ang > 360)
+                                ang -= 360;
+                        Main.map.statusLine.setAngle(ang);
                 }
         }
@@ -157 +166 @@
                 if (!isRectDrawing())
                         throw new IllegalStateException("Invalid drawing mode");
-                heading = angConstraint;
+                heading = drawingAngle;
                 setLengthWidth(projection1(p2), projection2(p2));
                 Main.map.statusLine.setHeading(Math.toDegrees(heading));
@@ -163 +172 @@
 
         public void angFix(EastNorth point) {
-                EastNorth en3 = this.en[2];
-                heading = en[0].heading(point);
+                EastNorth en3 = en[2];
+                EastNorth mid = en[0].getCenter(en3);
+                double radius = en3.distance(mid);
+                heading = mid.heading(point);
+                heading = en[0].heading(mid.add(Math.sin(heading) * radius, Math.cos(heading) * radius));
                 setLengthWidth(projection1(en3), projection2(en3));
-                this.en[2] = en3;
+                en[2] = en3;
         }
 
@@ -226 +238 @@
                 Way w = new Way();
                 w.addNode(nodes[0]);
-                if (projection1(en[2]) > 0) {
+                if (projection2(en[2]) > 0) {
                         w.addNode(nodes[1]);
                         w.addNode(nodes[2]);

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java

@@ -24 +24 @@
                 BuildingSizeDialog dlg = new BuildingSizeDialog();
                 if (dlg.getValue() == 1) {
-                        ToolSettings.setSizes(dlg.width(), dlg.lenstep());
-                        ToolSettings.setAddrDialog(dlg.useAddr());
+                        dlg.saveSettings();
                 }
         }

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java

@@ -55 +55 @@
                                 AdvancedSettingsDialog dlg = new AdvancedSettingsDialog();
                                 if (dlg.getValue() == 1) {
-                                        ToolSettings.setTag(dlg.getTag());
-                                        ToolSettings.setBBMode(dlg.isBBMode());
+                                        dlg.saveSettings();
                                 }
                         }
@@ -86 +85 @@
                 return caddr.isSelected();
         }
+
+        public void saveSettings() {
+                ToolSettings.setSizes(width(), lenstep());
+                ToolSettings.setAddrDialog(useAddr());
+        }
 }

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java

@@ -13 +13 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
+import java.awt.RenderingHints;
 import java.awt.Toolkit;
 import java.awt.event.AWTEventListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.awt.geom.GeneralPath;
+import java.awt.image.BufferedImage;
 import java.util.Collection;
+import java.util.LinkedList;
 
 import org.openstreetmap.josm.Main;
@@ -37 +41 @@
 
 @SuppressWarnings("serial")
-public class DrawBuildingAction extends MapMode
-                implements MapViewPaintable, AWTEventListener, SelectionChangedListener {
+public class DrawBuildingAction extends MapMode implements MapViewPaintable, AWTEventListener, SelectionChangedListener {
         enum Mode {
                 None, Drawing, DrawingWidth, DrawingAngFix
@@ -46 +49 @@
         final private Cursor cursorJoinNode;
         private Cursor currCursor;
+        private Cursor customCursor;
 
         private Mode mode = Mode.None;
@@ -51 +55 @@
 
         private Color selectedColor;
+        private Point drawStartPos;
         private Point mousePos;
-        private Point drawStartPos;
+        private boolean isCtrlDown;
+        private boolean isShiftDown;
 
         Building building = new Building();
@@ -129 +135 @@
                 Main.map.mapView.addTemporaryLayer(this);
                 DataSet.selListeners.add(this);
-                updateConstraint(getCurrentDataSet().getSelected());
+                updateSnap(getCurrentDataSet().getSelected());
                 try {
                         Toolkit.getDefaultToolkit().addAWTEventListener(this, AWTEvent.KEY_EVENT_MASK);
@@ -167 +173 @@
                         return;
                 KeyEvent ev = (KeyEvent) arg0;
-                if (ev.getKeyCode() == KeyEvent.VK_ESCAPE)
+                int modifiers = ev.getModifiersEx();
+                boolean isCtrlDown = (modifiers & KeyEvent.CTRL_DOWN_MASK) != 0;
+                boolean isShiftDown = (modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0;
+                if (this.isCtrlDown != isCtrlDown || this.isShiftDown != isShiftDown) {
+                        this.isCtrlDown = isCtrlDown;
+                        this.isShiftDown = isShiftDown;
+                        updCursor();
+                }
+                ev.getID();
+
+                if (ev.getKeyCode() == KeyEvent.VK_ESCAPE && ev.getID() == KeyEvent.KEY_PRESSED) {
+                        if (mode != Mode.None)
+                                ev.consume();
+
                         cancelDrawing();
-        }
-
-        private EastNorth getPoint(MouseEvent e) {
+                }
+        }
+
+        private EastNorth getEastNorth() {
                 Node n;
-                if (e.isControlDown()) {
+                if (isCtrlDown) {
                         n = null;
                 } else {
@@ -185 +205 @@
         }
 
-        private Mode modeDrawing(MouseEvent e) {
-                EastNorth p = getPoint(e);
-                if (building.isRectDrawing() && (!e.isShiftDown() || ToolSettings.isBBMode())) {
+        private boolean isRectDrawing() {
+                return building.isRectDrawing() && (!isShiftDown || ToolSettings.isBBMode());
+        }
+
+        private Mode modeDrawing() {
+                EastNorth p = getEastNorth();
+                if (isRectDrawing()) {
                         building.setPlaceRect(p);
-                        return e.isShiftDown() ? Mode.DrawingAngFix : Mode.None;
-                } else {
-                        building.setPlace(p, ToolSettings.getWidth(),
-                                        ToolSettings.getLenStep(), e.isShiftDown());
+                        return isShiftDown ? Mode.DrawingAngFix : Mode.None;
+                } else {
+                        building.setPlace(p, ToolSettings.getWidth(), ToolSettings.getLenStep(), isShiftDown);
                         Main.map.statusLine.setDist(building.getLength());
                         return this.nextMode = ToolSettings.getWidth() == 0 ? Mode.DrawingWidth : Mode.None;
@@ -198 +221 @@
         }
 
-        private Mode modeDrawingWidth(MouseEvent e) {
-                building.setWidth(getPoint(e));
+        private Mode modeDrawingWidth() {
+                building.setWidth(getEastNorth());
                 Main.map.statusLine.setDist(Math.abs(building.getWidth()));
                 return Mode.None;
         }
 
-        private Mode modeDrawingAngFix(MouseEvent e) {
-                building.angFix(getPoint(e));
+        private Mode modeDrawingAngFix() {
+                building.angFix(getEastNorth());
                 return Mode.None;
         }
@@ -211 +234 @@
         private void processMouseEvent(MouseEvent e) {
                 mousePos = e.getPoint();
+                isCtrlDown = e.isControlDown();
+                isShiftDown = e.isShiftDown();
                 if (mode == Mode.None) {
                         nextMode = Mode.None;
@@ -217 +242 @@
 
                 if (mode == Mode.Drawing) {
-                        nextMode = modeDrawing(e);
+                        nextMode = modeDrawing();
                 } else if (mode == Mode.DrawingWidth) {
-                        nextMode = modeDrawingWidth(e);
+                        nextMode = modeDrawingWidth();
                 } else if (mode == Mode.DrawingAngFix) {
-                        nextMode = modeDrawingAngFix(e);
+                        nextMode = modeDrawingAngFix();
                 } else
                         throw new AssertionError("Invalid drawing mode");
@@ -315 +340 @@
                 if (mousePos == null)
                         return;
-                Node n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isUsablePredicate);
-                if (n != null)
+                Node n = null;
+                if (!isCtrlDown)
+                        n = Main.map.mapView.getNearestNode(mousePos, OsmPrimitive.isUsablePredicate);
+                if (n != null) {
                         setCursor(cursorJoinNode);
-                else
-                        setCursor(cursorCrosshair);
+                } else {
+                        if (customCursor != null && (!isShiftDown || isRectDrawing()))
+                                setCursor(customCursor);
+                        else
+                                setCursor(cursorCrosshair);
+                }
 
         }
@@ -349 +380 @@
         }
 
-        public void updateConstraint(Collection<? extends OsmPrimitive> newSelection) {
-                building.disableAngConstraint();
-                if (newSelection.size() != 2)
-                        return;
-                Object[] arr = newSelection.toArray();
-                if (!(arr[0] instanceof Node && arr[1] instanceof Node))
-                        return;
-                EastNorth p1, p2;
-                p1 = latlon2eastNorth(((Node) arr[0]).getCoor());
-                p2 = latlon2eastNorth(((Node) arr[1]).getCoor());
-                building.setAngConstraint(p1.heading(p2));
+        public void updateSnap(Collection<? extends OsmPrimitive> newSelection) {
+                building.clearAngleSnap();
+                // update snap only if selection isn't too big
+                if (newSelection.size() <= 10) {
+                        LinkedList<Node> nodes = new LinkedList<Node>();
+                        LinkedList<Way> ways = new LinkedList<Way>();
+
+                        for (OsmPrimitive p : newSelection) {
+                                switch (p.getType()) {
+                                case NODE:
+                                        nodes.add((Node) p);
+                                        break;
+                                case WAY:
+                                        ways.add((Way) p);
+                                        break;
+                                }
+                        }
+
+                        building.addAngleSnap(nodes.toArray(new Node[0]));
+                        for (Way w : ways) {
+                                building.addAngleSnap(w);
+                        }
+                }
+                updateCustomCursor();
+        }
+
+        private void updateCustomCursor() {
+                Double angle = building.getDrawingAngle();
+                if (angle == null || !ToolSettings.isSoftCursor()) {
+                        customCursor = null;
+                        return;
+                }
+                final int r = 11; // crosshair radius
+                BufferedImage img = new BufferedImage(32, 32, BufferedImage.TYPE_INT_ARGB);
+                Graphics2D g = img.createGraphics();
+
+                GeneralPath b = new GeneralPath();
+                b.moveTo(16 - Math.cos(angle) * r, 16 - Math.sin(angle) * r);
+                b.lineTo(16 + Math.cos(angle) * r, 16 + Math.sin(angle) * r);
+                b.moveTo(16 + Math.sin(angle) * r, 16 - Math.cos(angle) * r);
+                b.lineTo(16 - Math.sin(angle) * r, 16 + Math.cos(angle) * r);
+
+                g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
+
+                g.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+                g.setColor(Color.WHITE);
+                g.draw(b);
+
+                g.setStroke(new BasicStroke(1, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+                g.setColor(Color.BLACK);
+                g.draw(b);
+
+                customCursor = Toolkit.getDefaultToolkit().createCustomCursor(img, new Point(16, 16), "custom crosshair");
+
+                updCursor();
         }
 
         public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                updateConstraint(newSelection);
+                updateSnap(newSelection);
         }
 }

applications/editors/josm/plugins/buildings_tools/src/buildings_tools/ToolSettings.java

@@ -1 +1 @@
 package buildings_tools;
+
+import org.openstreetmap.josm.Main;
 
 public class ToolSettings {
@@ -6 +8 @@
         private static boolean useAddr;
         private static String tag = "yes";
-        private static boolean bbMode;
 
         public static void setAddrDialog(boolean _useAddr) {
@@ -37 +38 @@
         }
 
-        public static void setBBMode(boolean _bbmode) {
-                bbMode = _bbmode;
+        public static void setBBMode(boolean bbmode) {
+                Main.pref.put("buildings_tools.bbmode", bbmode);
         }
 
         public static boolean isBBMode() {
-                return bbMode;
+                return Main.pref.getBoolean("buildings_tools.bbmode", false);
+        }
+
+        public static void setSoftCursor(boolean softCursor) {
+                Main.pref.put("buildings_tools.softcursor", softCursor);
+        }
+
+        public static boolean isSoftCursor() {
+                return Main.pref.getBoolean("buildings_tools.softcursor", false);
         }
 }