Changeset 1340 in josm for trunk/src/org

Timestamp:

2009-01-25T18:27:54+01:00 (16 years ago)

Author:

ulfl

Message:

add a mappaint "dashedcolour", which controls the background color of a dashed line

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MapPaintVisitor.java (modified) (10 diffs)
• gui/mappaint/ElemStyleHandler.java (modified) (1 diff)
• gui/mappaint/LineElemStyle.java (modified) (4 diffs)

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

@@ -55 +55 @@
     protected Color textColor;
     protected int currentDashed = 0;
+    protected Color currentDashedColor;
     protected int currentWidth = 0;
     protected Stroke currentStroke = null;
@@ -247 +248 @@
         int realWidth = 0; //the real width of the element in meters
         int dashed = 0;
+        Color dashedColor = null;
         Node lastN;
 
@@ -255 +257 @@
             realWidth = l.realWidth;
             dashed = l.dashed;
+            dashedColor = l.dashedColor;
         }
         if(selected)
@@ -279 +282 @@
                         {
                             drawSeg(lastN, n, s.color != null  && !w.selected ? s.color : color,
-                            false, s.getWidth(width), s.dashed);
+                            false, s.getWidth(width), s.dashed, s.dashedColor);
                         }
                         lastN = n;
@@ -295 +298 @@
             if(lastN != null)
                 drawSeg(lastN, n, color,
-                    showOnlyHeadArrowOnly ? !it.hasNext() : showDirection, width, dashed);
+                    showOnlyHeadArrowOnly ? !it.hasNext() : showDirection, width, dashed, dashedColor);
             lastN = n;
         }
@@ -312 +315 @@
                         {
                             drawSeg(lastN, n, s.color != null && !w.selected ? s.color : color,
-                            false, s.getWidth(width), s.dashed);
+                            false, s.getWidth(width), s.dashed, s.dashedColor);
                         }
                         lastN = n;
@@ -1084 +1087 @@
     }
 
-    private void drawSeg(Node n1, Node n2, Color col, boolean showDirection, int width, int dashed) {
+    private void drawSeg(Node n1, Node n2, Color col, boolean showDirection, int width, int dashed, Color dashedColor) {
         profilerSegments++;
-        if (col != currentColor || width != currentWidth || dashed != currentDashed) {
-            displaySegments(col, width, dashed);
+        if (col != currentColor || width != currentWidth || dashed != currentDashed || dashedColor != currentDashedColor) {
+            displaySegments(col, width, dashed, dashedColor);
         }
         Point p1 = nc.getPoint(n1.eastNorth);
@@ -1108 +1111 @@
 
     protected void displaySegments() {
-        displaySegments(null, 0, 0);
-    }
-
-    protected void displaySegments(Color newColor, int newWidth, int newDash) {
+        displaySegments(null, 0, 0, null);
+    }
+
+    protected void displaySegments(Color newColor, int newWidth, int newDash, Color newDashedColor) {
         if (currentPath != null) {
             Graphics2D g2d = (Graphics2D)g;
@@ -1122 +1125 @@
             }
             g2d.draw(currentPath);
+
+            if(currentDashedColor != null) {
+                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));
+                    else
+                        g2d.setStroke(new BasicStroke(currentWidth,BasicStroke.CAP_ROUND,BasicStroke.JOIN_ROUND));
+                }
+                g2d.draw(currentPath);
+            }
+            
             if(useStrokes > dist)
                 g2d.setStroke(new BasicStroke(1));
@@ -1129 +1144 @@
             currentWidth = newWidth;
             currentDashed = newDash;
+            currentDashedColor = newDashedColor;
             currentStroke = null;
         }

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

@@ -110 +110 @@
                     }                
                 }
-            } else if(atts.getQName(count).equals("priority"))
+            } else if (atts.getQName(count).equals("dashedcolour"))
+                line.dashedColor=convertColor(atts.getValue(count));
+            else if(atts.getQName(count).equals("priority"))
                 line.priority = Integer.parseInt(atts.getValue(count));
             else if(atts.getQName(count).equals("mode"))

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

@@ -10 +10 @@
     public Color color;
     public int dashed;
+    public Color dashedColor;
 
     public boolean over;
@@ -22 +23 @@
         this.color = s.color;
         this.dashed = s.dashed;
+        this.dashedColor = s.dashedColor;
         this.over = s.over;
         this.widthMode = s.widthMode;
@@ -35 +37 @@
         this.color = s.color;
         this.dashed = s.dashed;
+        this.dashedColor = s.dashedColor;
         this.over = s.over;
         this.widthMode = s.widthMode;
@@ -55 +58 @@
         realWidth = 0;
         dashed = 0;
+        dashedColor = null;
         priority = 0;
         color = null;