Changeset 808 in josm for trunk/src/org

Timestamp:

2008-08-18T23:09:36+02:00 (16 years ago)

Author:

stoecker

Message:

fixed virtual nodes a bit

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• osm/visitor/MapPaintVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -334 +334 @@
 
         synchronized public int getInteger(String key, int def) {
+                putDefault(key, Integer.toString(def));
                 String v = get(key);
                 if(null == v)

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

@@ -156 +156 @@
                                 {
                                         // hack to make direction arrows visible against filled background
-                                        if (showDirection)
-                                                drawSeg(lastN, n, w.selected ? selectedColor : untaggedColor, showDirection, width, true);
+                                        if (showDirection || virtualNodeSize != 0)
+                                                drawSeg(lastN, n, w.selected ? selectedColor : untaggedColor, showDirection, width, false, false);
                                 }
                                 else
-                                        drawSeg(lastN, n, w.selected ? selectedColor : colour, showDirection, width, true);
+                                        drawSeg(lastN, n, w.selected ? selectedColor : colour, showDirection, width, true, true);
                         } else {
                                 if (realWidth > 0 && useRealWidth && !showDirection) {
@@ -166 +166 @@
                                         if (tmpWidth > width) width = tmpWidth;
                                 }
-                                drawSeg(lastN, n, w.selected ? selectedColor : colour, showDirection, width, dashed);
+                                drawSeg(lastN, n, w.selected ? selectedColor : colour, showDirection, width, dashed, true);
                         }
 
@@ -227 +227 @@
         protected void drawSegment(Node n1, Node n2, Color col, boolean showDirection) {
                 if (useRealWidth && showDirection) showDirection = false;
-                drawSeg(n1, n2, col, showDirection, 1, false);
-        }
-
-        private void drawSeg(Node n1, Node n2, Color col, boolean showDirection, int width, boolean dashed) {
+                drawSeg(n1, n2, col, showDirection, 1, false, true);
+        }
+
+        private void drawSeg(Node n1, Node n2, Color col, boolean showDirection, int width, boolean dashed, boolean drawway) {
                 if (col != currentColor || width != currentWidth || dashed != currentDashed) {
                         displaySegments(col, width, dashed);
@@ -241 +241 @@
                 }
                 drawVirtualNode(p1, p2, col);
-                currentPath.moveTo(p1.x, p1.y);
-                currentPath.lineTo(p2.x, p2.y);
+                if(drawway)
+                {
+                        currentPath.moveTo(p1.x, p1.y);
+                        currentPath.lineTo(p2.x, p2.y);
+                }
 
                 if (showDirection) {
                         double t = Math.atan2(p2.y-p1.y, p2.x-p1.x) + Math.PI;
+                        if(!drawway)
+                                currentPath.moveTo(p2.x, p2.y);
                         currentPath.lineTo((int)(p2.x + 10*Math.cos(t-PHI)), (int)(p2.y + 10*Math.sin(t-PHI)));
                         currentPath.moveTo((int)(p2.x + 10*Math.cos(t+PHI)), (int)(p2.y + 10*Math.sin(t+PHI)));
@@ -321 +326 @@
                         osm.visit(this);
 
+                for (final OsmPrimitive osm : data.getSelected())
+                        if (!osm.incomplete && !osm.deleted){
+                                osm.visit(this);
+                        }
+
                 for (final OsmPrimitive osm : data.nodes)
                         if (!osm.incomplete && !osm.deleted)
                                 osm.visit(this);
-
-                for (final OsmPrimitive osm : data.getSelected())
-                        if (!osm.incomplete && !osm.deleted){
-                                osm.visit(this);
-                        }
                 displaySegments();
         }