Changeset 3907 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2011-02-15T22:31:05+01:00 (14 years ago)

Author:

bastiK

Message:

fixed #5962 - segment numbers for oneway ways not shown

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPainter.java (modified) (3 diffs)
• gui/mappaint/LineElemStyle.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -817 +817 @@
      * parents way
      */
-    public void drawOrderNumber(Node n1, Node n2, int orderNumber) {
+    public void drawOrderNumber(Node n1, Node n2, int orderNumber, Color clr) {
         Point p1 = nc.getPoint(n1);
         Point p2 = nc.getPoint(n2);
-        drawOrderNumber(p1, p2, orderNumber);
+        drawOrderNumber(p1, p2, orderNumber, clr);
     }
 
@@ -827 +827 @@
      * parents way
      */
-    protected void drawOrderNumber(Point p1, Point p2, int orderNumber) {
+    protected void drawOrderNumber(Point p1, Point p2, int orderNumber, Color clr) {
         if (isSegmentVisible(p1, p2) && isLargeSegment(p1, p2, segmentNumberSpace)) {
             String on = Integer.toString(orderNumber);
@@ -839 +839 @@
             }
 
-            Color c = g.getColor();
             g.setColor(backgroundColor);
             g.fillRect(x-1, y-12, 8*strlen+1, 14);
-            g.setColor(c);
+            g.setColor(clr);
             g.drawString(on, x, y);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -238 +238 @@
                 if(lastN != null) {
                     orderNumber++;
-                    painter.drawOrderNumber(lastN, n, orderNumber);
+                    painter.drawOrderNumber(lastN, n, orderNumber, myColor);
                 }
                 lastN = n;