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

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

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• ElemStyleHandler.java (modified) (1 diff)
• LineElemStyle.java (modified) (2 diffs)

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

@@ -105 +105 @@
                 try
                 {
-                    line.dashed=Integer.parseInt(atts.getValue(count));
+                    String[] parts = atts.getValue(count).split(",");
+                    line.dashed = new float[parts.length];
+                    for (int i = 0; i < parts.length; i++) {
+                        line.dashed[i] = (float)(Integer.parseInt(parts[i]));
+                    }
                 } catch (NumberFormatException nfe) {
                     boolean dashed=Boolean.parseBoolean(atts.getValue(count));
                     if(dashed) {
-                        line.dashed = 9;
+                        line.dashed = new float[]{9};
                     }
                 }

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

@@ -9 +9 @@
     public int realWidth; //the real width of this line in meter
     public Color color;
-    public int dashed;
+    public float[] dashed;
     public Color dashedColor;
 
@@ -57 +57 @@
         width = 1;
         realWidth = 0;
-        dashed = 0;
+        dashed = new float[0];
         dashedColor = null;
         priority = 0;