Changeset 950 in josm for trunk/src

Timestamp:

2008-09-13T14:48:20+02:00 (16 years ago)

Author:

stoecker

Message:

use the mappaint.node.virtual-size as planned

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (2 diffs)
• data/osm/visitor/SimplePaintVisitor.java (modified) (2 diffs)
• gui/preferences/DrawingPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -119 +119 @@
                 Main.map.mapView.addMouseListener(this);
                 Main.map.mapView.addMouseMotionListener(this);
-                Main.map.mapView.enableVirtualNodes(Main.pref.getInteger("mappaint.node.virtual-size", 4) != 0);
+                Main.map.mapView.enableVirtualNodes(
+                Main.pref.getInteger("mappaint.node.virtual-size", 6) != 0);
         }
 
@@ -238 +239 @@
                         {
                                 osm = nearestWaySeg.way;
-                                if(Main.pref.getInteger("mappaint.node.virtual-size", 4) > 0)
+                                if(Main.pref.getInteger("mappaint.node.virtual-size", 6) > 0)
                                 {
                                         Way w = (Way)osm;

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -108 +108 @@
                 fillSelectedNode = Main.pref.getBoolean("mappaint.node.fill-selected", true);
                 fillUnselectedNode = Main.pref.getBoolean("mappaint.node.fill-unselected", false);
-                virtualNodeSize = virtual ? Main.pref.getInteger("mappaint.node.virtual-size", 4) / 2 : 0;
+                virtualNodeSize = virtual ? Main.pref.getInteger("mappaint.node.virtual-size", 6) / 2 : 0;
                 virtualNodeSpace = Main.pref.getInteger("mappaint.node.virtual-space", 70);
                 segmentNumberSpace = Main.pref.getInteger("mappaint.segmentnumber.space", 40);
@@ -191 +191 @@
                                         int x = (p.x+lastP.x)/2;
                                         int y = (p.y+lastP.y)/2;
-                                        currentPath.moveTo(x-5, y);
-                                        currentPath.lineTo(x+5, y);
-                                        currentPath.moveTo(x, y-5);
-                                        currentPath.lineTo(x, y+5);
+                                        currentPath.moveTo(x-virtualNodeSize, y);
+                                        currentPath.lineTo(x+virtualNodeSize, y);
+                                        currentPath.moveTo(x, y-virtualNodeSize);
+                                        currentPath.lineTo(x, y+virtualNodeSize);
                                 }
                                 lastP = p;

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

@@ -125 +125 @@
                 // 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);
+                virtualNodes.setSelected(Main.pref.getInteger("mappaint.node.virtual-size", 6) != 0);
                 gui.display.add(virtualNodes, GBC.eop().insets(20,0,0,0));
 
@@ -148 +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");
-    }
+                int vn = Main.pref.getInteger("mappaint.node.virtual-size", 6);
+                if(virtualNodes.isSelected()) { if (vn < 1) vn = 6; }
+                else { vn = 0; }
+                Main.pref.put("mappaint.node.virtual-size", vn);
+        }
 }