Changeset 16700 in josm for trunk

Timestamp:

2020-06-21T18:53:41+02:00 (4 years ago)

Author:

simon04

Message:

fix #18213 - MapCSS: add support for repeat-image-opacity

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (3 diffs)
• gui/mappaint/styleelement/RepeatImageElement.java (modified) (8 diffs)

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

@@ -6 +6 @@
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Composite;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -682 +683 @@
      * @param spacing spacing between two images
      * @param phase initial spacing
+     * @param opacity the opacity
      * @param align alignment of the image. The top, center or bottom edge can be aligned with the way.
      */
     public void drawRepeatImage(IWay<?> way, MapImage pattern, boolean disabled, double offset, double spacing, double phase,
-            LineImageAlignment align) {
+                                float opacity, LineImageAlignment align) {
         final int imgWidth = pattern.getWidth();
         final double repeat = imgWidth + spacing;
@@ -730 +732 @@
                 int sx1 = Math.max(0, -x);
                 int sx2 = imgWidth - Math.max(0, x + imgWidth - (int) Math.ceil(segmentLength));
+                Composite saveComposite = g.getComposite();
+                g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, opacity));
                 g.drawImage(image, x + sx1, dy1, x + sx2, dy2, sx1, 0, sx2, imgHeight, null);
+                g.setComposite(saveComposite);
                 imageStart += repeat;
             }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/RepeatImageElement.java

@@ -67 +67 @@
     public float phase;
     /**
+     * The opacity
+     */
+    public float opacity;
+    /**
      * The alignment of the image
      */
@@ -81 +85 @@
      * @param spacing The space between the images
      * @param phase The offset of the first image along the way
+     * @param opacity The opacity
      * @param align The alignment of the image
      */
-    public RepeatImageElement(Cascade c, MapImage pattern, float offset, float spacing, float phase, LineImageAlignment align) {
+    public RepeatImageElement(Cascade c, MapImage pattern, float offset, float spacing, float phase, float opacity, LineImageAlignment align) {
         super(c, 2.9f);
         CheckParameterUtil.ensureParameterNotNull(pattern);
@@ -91 +96 @@
         this.spacing = spacing;
         this.phase = phase;
+        this.opacity = opacity;
         this.align = align;
     }
@@ -107 +113 @@
         float spacing = c.get(REPEAT_IMAGE_SPACING, 0f, Float.class);
         float phase = -c.get(REPEAT_IMAGE_PHASE, 0f, Float.class);
+        float opacity = c.get(REPEAT_IMAGE_OPACITY, 1f, Float.class);
 
         LineImageAlignment align = LineImageAlignment.CENTER;
@@ -116 +123 @@
         }
 
-        return new RepeatImageElement(c, pattern, offset, spacing, phase, align);
+        return new RepeatImageElement(c, pattern, offset, spacing, phase, opacity, align);
     }
 
@@ -124 +131 @@
         if (primitive instanceof IWay) {
             IWay<?> w = (IWay<?>) primitive;
-            painter.drawRepeatImage(w, pattern, painter.isInactiveMode() || w.isDisabled(), offset, spacing, phase, align);
+            painter.drawRepeatImage(w, pattern, painter.isInactiveMode() || w.isDisabled(), offset, spacing, phase, opacity, align);
         }
     }
@@ -148 +155 @@
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), pattern, offset, spacing, phase, align);
+        return Objects.hash(super.hashCode(), pattern, offset, spacing, phase, opacity, align);
     }
 
@@ -155 +162 @@
         return "RepeatImageStyle{" + super.toString() + "pattern=[" + pattern +
                 "], offset=" + offset + ", spacing=" + spacing +
-                ", phase=" + -phase + ", align=" + align + '}';
+                ", phase=" + -phase + ", opacity=" + opacity + ", align=" + align + '}';
     }
 }