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

Timestamp:

2011-02-05T19:47:07+01:00 (13 years ago)

Author:

bastiK

Message:

mapcss: dashes

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (3 diffs)

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

@@ -100 +100 @@
     }
 
-    public void drawWay(Way way, Color color, float width, float dashed[], Color dashedColor, boolean showDirection,
+    public void drawWay(Way way, Color color, float width, float dashed[], float dashesOffset, Color dashedColor, boolean showDirection,
             boolean reversedDirection, boolean showHeadArrowOnly) {
 
@@ -156 +156 @@
             lastPoint = p;
         }
-        displaySegments(path, arrows, color, width, dashed, dashedColor);
-    }
-
-    private void displaySegments(GeneralPath path, GeneralPath arrows, Color color, float width, float dashed[], Color dashedColor) {
+        displaySegments(path, arrows, color, width, dashed, dashesOffset, dashedColor);
+    }
+
+    private void displaySegments(GeneralPath path, GeneralPath arrows, Color color, float width, float dashed[], float dashesOffset, Color dashedColor) {
         g.setColor(inactive ? inactiveColor : color);
         if (useStrokes) {
             if (dashed != null && dashed.length > 0) {
-                g.setStroke(new BasicStroke(width,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0, dashed,0));
+                g.setStroke(new BasicStroke(width,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,dashed,dashesOffset));
             } else {
                 g.setStroke(new BasicStroke(width,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
@@ -175 +175 @@
             if (dashed != null && dashed.length > 0) {
                 float[] dashedOffset = new float[dashed.length];
-                System.arraycopy(dashed, 1, dashedOffset, 0, dashed.length - 1);
-                dashedOffset[dashed.length-1] = dashed[0];
-                float offset = dashedOffset[0];
-                g.setStroke(new BasicStroke(width,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,dashedOffset,offset));
+                System.arraycopy(dashed, 0, dashedOffset, 1, dashed.length - 1);
+                dashedOffset[0] = dashed[dashed.length-1];
+                float offset = dashedOffset[0] + dashesOffset;
+                g.setStroke(new BasicStroke(width,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,dashedOffset, offset));
             } else {
                 g.setStroke(new BasicStroke(width,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));