Changeset 1289 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-01-17T23:45:34+01:00 (16 years ago)

Author:

stoecker

Message:

close #2028. patch by robome

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor

Files:

• MapPaintVisitor.java (modified) (3 diffs)
• SimplePaintVisitor.java (modified) (4 diffs)

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

@@ -17 +17 @@
 import java.util.LinkedList;
 import java.util.Locale;
+import java.util.Iterator;
 
 import javax.swing.ImageIcon;
@@ -225 +226 @@
         boolean showDirection = w.selected || ((!useRealWidth) && (showDirectionArrow
         && (!showRelevantDirectionsOnly || w.hasDirectionKeys)));
+        // head only takes over control if the option is true,
+        // the direction should be shown at all and not only because it's selected
+        boolean showOnlyHeadArrowOnly = showDirection && !w.selected && showHeadArrowOnly;
         int width = defaultSegmentWidth;
         int realWidth = 0; //the real width of the element in meters
@@ -270 +274 @@
         // draw the way
         lastN = null;
-        for(Node n : w.nodes)
-        {
+        Iterator<Node> it = w.nodes.iterator();
+        while (it.hasNext())
+        {
+            Node n = it.next();
             if(lastN != null)
-                drawSeg(lastN, n, color, showDirection, width, dashed);
+                drawSeg(lastN, n, color,
+                    showOnlyHeadArrowOnly ? !it.hasNext() : showDirection, width, dashed);
             lastN = n;
         }

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

@@ -64 +64 @@
     protected boolean showDirectionArrow;
     protected boolean showRelevantDirectionsOnly;
+    protected boolean showHeadArrowOnly;
     protected boolean showOrderNumber;
     protected boolean fillSelectedNode;
@@ -101 +102 @@
         showDirectionArrow = Main.pref.getBoolean("draw.segment.direction", true);
         showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only", true);
+        showHeadArrowOnly = Main.pref.getBoolean("draw.segment.head_only", false);
         showOrderNumber = Main.pref.getBoolean("draw.segment.order_number", false);
         selectedNodeRadius = Main.pref.getInteger("mappaint.node.selected-size", 5) / 2;
@@ -292 +294 @@
         boolean showThisDirectionArrow = w.selected
         || (showDirectionArrow && (!showRelevantDirectionsOnly || w.hasDirectionKeys));
+        // head only takes over control if the option is true,
+        // the direction should be shown at all and not only because it's selected
+        boolean showOnlyHeadArrowOnly = showThisDirectionArrow && !w.selected && showHeadArrowOnly;
         Color wayColor;
 
@@ -307 +312 @@
             for (int orderNumber = 1; it.hasNext(); orderNumber++) {
                 Point p = nc.getPoint(it.next().eastNorth);
-                drawSegment(lastP, p, w.selected && !inactive ? selectedColor : wayColor, showThisDirectionArrow);
+                drawSegment(lastP, p, w.selected && !inactive ? selectedColor : wayColor, 
+                    showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
                 if (showOrderNumber)
                     drawOrderNumber(lastP, p, orderNumber);