Changeset 805 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-08-18T01:27:58+02:00 (16 years ago)

Author:

stoecker

Message:

Added virtual nodes in select mode. Closes #595.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (1 diff)
• NavigatableComponent.java (modified) (9 diffs)
• layer/OsmDataLayer.java (modified) (3 diffs)
• preferences/DrawingPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -182 +182 @@
         }
 
+        private Boolean virtualnodes = false;
+        public void enableVirtualNodes(Boolean state)
+        {
+                if(virtualnodes != state)
+                {
+                        virtualnodes = state;
+                        repaint();
+                }
+        }
+        public Boolean useVirtualNodes()
+        {
+                return virtualnodes;
+        }
+
         /**
          * Moves the layer to the given new position. No event is fired.

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -32 +32 @@
 public class NavigatableComponent extends JComponent implements Helpful {
 
-
         public static final EastNorth world = Main.proj.latlon2eastNorth(new LatLon(Projection.MAX_LAT, Projection.MAX_LON));
-
+        public static final int snapDistance = sqr(Main.pref.getInteger("node.snap-distance", 10));
+
+        private static int sqr(int a) { return a*a;}
         /**
          * The scale factor in x or y-units per pixel. This means, if scale = 10,
@@ -141 +142 @@
                         Point sp = getPoint(n.eastNorth);
                         double dist = p.distanceSq(sp);
-                        if (minDistanceSq > dist && dist < 100) {
+                        if (minDistanceSq > dist && dist < snapDistance) {
                                 minDistanceSq = p.distanceSq(sp);
                                 minPrimitive = n;
@@ -180 +181 @@
                                 double b = p.distanceSq(A);
                                 double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
-                                if (perDist < 100 && a < c+100 && b < c+100) {
+                                if (perDist < snapDistance && a < c+snapDistance && b < c+snapDistance) {
                                         List<WaySegment> l;
                                         if (nearest.containsKey(perDist)) {
@@ -228 +229 @@
                 WaySegment nearestWaySeg = getNearestWaySegment(p);
                 return nearestWaySeg == null ? null : nearestWaySeg.way;
-    }
+        }
 
         /**
@@ -240 +241 @@
          * If nothing is found, return <code>null</code>.
          *
-         * @param p                              The point on screen.
-         * @return      The primitive that is nearest to the point p.
+         * @param p The point on screen.
+         * @return  The primitive that is nearest to the point p.
          */
         public OsmPrimitive getNearest(Point p) {
                 OsmPrimitive osm = getNearestNode(p);
                 if (osm == null)
+                {
                         osm = getNearestWay(p);
+                }
                 return osm;
         }
@@ -258 +261 @@
                         return Collections.emptySet();
                 return Collections.singleton(osm);
-        }
-
-        @Deprecated
-        public OsmPrimitive getNearest(Point p, boolean segmentInsteadWay) {
-                return getNearest(p);
         }
 
@@ -290 +288 @@
                                 double b = p.distanceSq(A);
                                 double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
-                                if (perDist < 100 && a < c+100 && b < c+100) {
+                                if (perDist < snapDistance && a < c+snapDistance && b < c+snapDistance) {
                                         nearest.add(w);
                                                 break;
@@ -299 +297 @@
                 for (Node n : Main.ds.nodes) {
                         if (!n.deleted && !n.incomplete
-                                        && getPoint(n.eastNorth).distanceSq(p) < 100) {
+                                        && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
                                 nearest.add(n);
                         }
@@ -318 +316 @@
                 for (Node n : Main.ds.nodes) {
                         if (!n.deleted && !n.incomplete
-                                        && getPoint(n.eastNorth).distanceSq(p) < 100) {
+                                        && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
                                 nearest.add(n);
                         }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -148 +148 @@
         @Override public void paint(final Graphics g, final MapView mv) {
                 boolean inactive = Main.map.mapView.getActiveLayer() != this && Main.pref.getBoolean("draw.data.inactive_color", true);
+                boolean virtual = !inactive && Main.map.mapView.useVirtualNodes();
                 if (Main.pref.getBoolean("draw.data.downloaded_area", true)) {
                         // FIXME this is inefficient; instead a proper polygon has to be built, and instead
@@ -169 +170 @@
                         wireframeMapPainter.setNavigatableComponent(mv);
                         wireframeMapPainter.inactive = inactive;
-                        wireframeMapPainter.visitAll(data);
+                        wireframeMapPainter.visitAll(data, virtual);
                 }
                 else
@@ -176 +177 @@
                         standardMapPainter.setNavigatableComponent(mv);
                         standardMapPainter.inactive = inactive;
-                        standardMapPainter.visitAll(data);
+                        standardMapPainter.visitAll(data, virtual);
                 }
                 Main.map.conflictDialog.paintConflicts(g, mv);

trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

@@ -27 +27 @@
         private JCheckBox segmentOrderNumber = new JCheckBox(tr("Draw segment order numbers"));
         private JCheckBox sourceBounds = new JCheckBox(tr("Draw boundaries of downloaded data"));
+        private JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
         private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
         private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)"));
@@ -121 +122 @@
                 sourceBounds.setSelected(Main.pref.getBoolean("draw.data.downloaded_area", true));
                 gui.display.add(sourceBounds, GBC.eop().insets(20,0,0,0));
-                
+
+                // virtual nodes
+                virtualNodes.setToolTipText(tr("Draw virtual nodes in select mode for easy way modification."));
+                virtualNodes.setSelected(Main.pref.getInteger("mappaint.node.virtual-size", 4) != 0);
+                gui.display.add(virtualNodes, GBC.eop().insets(20,0,0,0));
+
                 // background layers in inactive color
                 inactive.setToolTipText(tr("Draw the inactive data layers in a different color."));
@@ -142 +148 @@
                 Main.pref.put("draw.data.inactive_color", inactive.isSelected());
                 Main.pref.put("mappaint.use-antialiasing", useAntialiasing.isSelected());
+                Main.pref.put("mappaint.node.virtual-size", virtualNodes.isSelected() ? "4" : "0");
     }
 }