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

Timestamp:

2009-06-06T13:33:27+02:00 (17 years ago)

Author:

stoecker

Message:

fix #2667 - patch by Daeron - Add support for dash patterns in mappaint

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (5 diffs)

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

@@ -55 +55 @@
     protected Color untaggedColor;
     protected Color textColor;
-    protected int currentDashed = 0;
+    protected float[] currentDashed = new float[0];
     protected Color currentDashedColor;
     protected int currentWidth = 0;
@@ -250 +250 @@
         int width = defaultSegmentWidth;
         int realWidth = 0; /* the real width of the element in meters */
-        int dashed = 0;
+        float dashed[] = new float[0];
         Color dashedColor = null;
         Node lastN;
@@ -1125 +1125 @@
     }
 
-    private void drawSeg(Node n1, Node n2, Color col, boolean showDirection, int width, int dashed, Color dashedColor) {
+    private void drawSeg(Node n1, Node n2, Color col, boolean showDirection, int width, float dashed[], Color dashedColor) {
         //profilerSegments++;
-        if (col != currentColor || width != currentWidth || dashed != currentDashed || dashedColor != currentDashedColor) {
+        if (col != currentColor || width != currentWidth || !Arrays.equals(dashed,currentDashed) || dashedColor != currentDashedColor) {
             displaySegments(col, width, dashed, dashedColor);
         }
@@ -1149 +1149 @@
 
     protected void displaySegments() {
-        displaySegments(null, 0, 0, null);
-    }
-
-    protected void displaySegments(Color newColor, int newWidth, int newDash, Color newDashedColor) {
+        displaySegments(null, 0, new float[0], null);
+    }
+
+    protected void displaySegments(Color newColor, int newWidth, float newDash[], Color newDashedColor) {
         if (currentPath != null) {
             Graphics2D g2d = (Graphics2D)g;
             g2d.setColor(inactive ? inactiveColor : currentColor);
             if (currentStroke == null && useStrokes > dist) {
-                if (currentDashed != 0)
-                    g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,new float[] {currentDashed},0));
+                if (currentDashed.length > 0) {
+                    try {
+                        g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,currentDashed,0));
+                    } catch (IllegalArgumentException e) {
+                        g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
+                    }
+                }
                 else
                     g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
@@ -1167 +1172 @@
                 g2d.setColor(currentDashedColor);
                 if (currentStroke == null && useStrokes > dist) {
-                    if (currentDashed != 0)
-                        g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,new float[] {currentDashed},currentDashed));
+                    if (currentDashed.length > 0) {
+                        float[] currentDashedOffset = new float[currentDashed.length];
+                        System.arraycopy(currentDashed, 1, currentDashedOffset, 0, currentDashed.length - 1);
+                        currentDashedOffset[currentDashed.length-1] = currentDashed[0];
+                        float offset = currentDashedOffset[0];
+                        try {
+                            g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_BUTT,BasicStroke.JOIN_ROUND,0,currentDashedOffset,offset));
+                        } catch (IllegalArgumentException e) {
+                            g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
+                        }
+                    }
                     else
                         g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));