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

Timestamp:

2013-03-29T14:44:47+01:00 (12 years ago)

Author:

bastiK

Message:

mapcss: add phase for repeat-image

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (5 diffs)
• gui/mappaint/NodeElemStyle.java (modified) (1 diff)
• gui/mappaint/RepeatImageElemStyle.java (modified) (7 diffs)
• gui/mappaint/StyleKeys.java (modified) (1 diff)

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

@@ -598 +598 @@
     @Deprecated
     public void drawLinePattern(Way way, Image pattern) {
-        drawRepeatImage(way, pattern, 0f, 0f, LineImageAlignment.TOP);
+        drawRepeatImage(way, pattern, 0f, 0f, 0f, LineImageAlignment.TOP);
     }
 
@@ -608 +608 @@
      * @param offset offset from the way
      * @param spacing spacing between two images
+     * @param phase initial spacing
      * @param align alignment of the image. The top, center or bottom edge
      * can be aligned with the way.
      */
-    public void drawRepeatImage(Way way, Image pattern, float offset, float spacing, LineImageAlignment align) {
+    public void drawRepeatImage(Way way, Image pattern, float offset, float spacing, float phase, LineImageAlignment align) {
         final int imgWidth = pattern.getWidth(null);
         final double repeat = imgWidth + spacing;
@@ -617 +618 @@
 
         Point lastP = null;
-        double currentWayLength = 0;
+        double currentWayLength = phase % repeat;
+        if (currentWayLength < 0) {
+            currentWayLength += repeat;
+        }
 
         int dy1, dy2;
@@ -647 +651 @@
                 final double dy = thisP.y - lastP.y;
 
-                double pos = currentWayLength == 0 ? 0 : repeat - (currentWayLength % repeat);
+                // pos is the position from the beginning of the current segment
+                // where an image should be painted
+                double pos = repeat - (currentWayLength % repeat);
 
                 AffineTransform saveTransform = g.getTransform();
@@ -656 +662 @@
                 // is cut off
                 if (pos > spacing) {
-                    g.drawImage(pattern, 0, dy1, (int) (pos - spacing), dy2,
-                            (int) (imgWidth + spacing - pos), 0, imgWidth, imgHeight, null);
+                    // segment is too short for a complete image
+                    if (pos > segmentLength + spacing) {
+                        g.drawImage(pattern, 0, dy1, (int) segmentLength, dy2,
+                                (int) (repeat - pos), 0,
+                                (int) (repeat - pos + segmentLength), imgHeight, null);
+                    // rest of the image fits fully on the current segment
+                    } else {
+                        g.drawImage(pattern, 0, dy1, (int) (pos - spacing), dy2,
+                                (int) (repeat - pos), 0, imgWidth, imgHeight, null);
+                    }
                 }
                 // draw remaining images for this segment

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

@@ -118 +118 @@
     }
 
-    public static MapImage createIcon(Environment env, String[] keys) {
+    public static MapImage createIcon(final Environment env, final String[] keys) {
         Cascade c = env.mc.getCascade(env.layer);
 

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

@@ -17 +17 @@
     public float offset;
     public float spacing;
+    public float phase;
     public LineImageAlignment align;
 
-    public RepeatImageElemStyle(Cascade c, MapImage pattern, float offset, float spacing, LineImageAlignment align) {
+    public RepeatImageElemStyle(Cascade c, MapImage pattern, float offset, float spacing, float phase, LineImageAlignment align) {
         super(c, 2.9f);
         CheckParameterUtil.ensureParameterNotNull(pattern);
@@ -26 +27 @@
         this.offset = offset;
         this.spacing = spacing;
+        this.phase = phase;
         this.align = align;
     }
@@ -34 +36 @@
             return null;
         Cascade c = env.mc.getCascade(env.layer);
-        Float offset = c.get(REPEAT_IMAGE_OFFSET, 0f, Float.class);
-        Float spacing = c.get(REPEAT_IMAGE_SPACING, 0f, Float.class);
+        float offset = c.get(REPEAT_IMAGE_OFFSET, 0f, Float.class);
+        float spacing = c.get(REPEAT_IMAGE_SPACING, 0f, Float.class);
+        float phase = - c.get(REPEAT_IMAGE_PHASE, 0f, Float.class);
 
         LineImageAlignment align = LineImageAlignment.CENTER;
@@ -45 +48 @@
         }
 
-        return new RepeatImageElemStyle(c, pattern, offset, spacing, align);
+        return new RepeatImageElemStyle(c, pattern, offset, spacing, phase, align);
     }
 
     @Override
     public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, StyledMapRenderer painter, boolean selected, boolean member) {
-        Way w = (Way)primitive;
-        painter.drawRepeatImage(w, pattern.getImage(), offset, spacing, align);
+        Way w = (Way) primitive;
+        painter.drawRepeatImage(w, pattern.getImage(), offset, spacing, phase, align);
     }
 
@@ -69 +72 @@
         if (this.offset != other.offset) return false;
         if (this.spacing != other.spacing) return false;
+        if (this.phase != other.phase) return false;
         if (this.align != other.align) return false;
         return true;
@@ -79 +83 @@
         hash = 83 * hash + Float.floatToIntBits(this.offset);
         hash = 83 * hash + Float.floatToIntBits(this.spacing);
+        hash = 83 * hash + Float.floatToIntBits(this.phase);
         hash = 83 * hash + this.align.hashCode();
         return hash;
@@ -86 +91 @@
     public String toString() {
         return "RepeatImageStyle{" + super.toString() + "pattern=[" + pattern +
-                "], offset=" + offset + ", spacing=" + spacing + ", align=" + align + "}";
+                "], offset=" + offset + ", spacing=" + spacing +
+                ", phase=" + (-phase) + ", align=" + align + "}";
     }
 }

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

@@ -25 +25 @@
     String REPEAT_IMAGE_OFFSET = "repeat-image-offset";
     String REPEAT_IMAGE_SPACING = "repeat-image-spacing";
+    String REPEAT_IMAGE_PHASE = "repeat-image-phase";
     String REPEAT_IMAGE_ALIGN = "repeat-image-align";