Changeset 3879 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

Timestamp:

2011-02-09T19:13:04+01:00 (15 years ago)

Author:

bastiK

Message:

mapcss: improve shape & area style generation

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified) (7 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 
 public class AreaElemStyle extends ElemStyle
 {
+    /**
+     * If fillImage == null, color is the fill-color, otherwise
+     * an arbitrary color value sampled from the fillImage
+     */
     public Color color;
     public BufferedImage fillImage;
+    public float fillImageAlpha;
 
-    protected AreaElemStyle(Cascade c, Color color, BufferedImage fillImage) {
+    protected AreaElemStyle(Cascade c, Color color, BufferedImage fillImage, float fillImageAlpha) {
         super(c);
+        CheckParameterUtil.ensureParameterNotNull(color);
         this.color = color;
         this.fillImage = fillImage;
+        this.fillImageAlpha = fillImageAlpha;
     }
 
     public static AreaElemStyle create(Cascade c) {
         BufferedImage fillImage = null;
+        Color color = null;
+        float fillImageAlpha = 1f;
+
         IconReference iconRef = c.get("fill-image", null, IconReference.class);
-        Integer fillImageAlpha = null;
-
         if (iconRef != null) {
             ImageIcon icon = MapPaintStyles.getIcon(iconRef, false);
@@ -42 +51 @@
                 fillImage = (BufferedImage) icon.getImage();
 
-                fillImageAlpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255))));
-                Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class));
+                color = new Color(fillImage.getRGB(fillImage.getWidth() / 2, fillImage.getHeight() / 2));
+
+                fillImageAlpha = Utils.color_int2float(Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255)))));
+                Float pAlpha = c.get("fill-opacity", null, Float.class);
                 if (pAlpha != null) {
+                    if (pAlpha < 0f || pAlpha > 1f) {
+                        pAlpha= 1f;
+                    }
                     fillImageAlpha = pAlpha;
                 }
             }
-        }
-
-        Color color = c.get("fill-color", null, Color.class);
-        if (color != null) {
-
-            int alpha;
-            if (fillImageAlpha != null) {
-                alpha = fillImageAlpha;
-            } else {
-                alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
+        } else {
+            color = c.get("fill-color", null, Color.class);
+            if (color != null) {
+                int alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
                 Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class));
                 if (pAlpha != null) {
                     alpha = pAlpha;
                 }
+                color = new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha);
             }
-            color = new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha);
         }
         
-        if (fillImage != null || color != null) {
-            if (color == null) {
-                color = new Color(0, 0, 0, fillImageAlpha);
-            }
-            return new AreaElemStyle(c, color, fillImage);
-        }
+        if (color != null)
+            return new AreaElemStyle(c, color, fillImage, fillImageAlpha);
         else
             return null;
@@ -86 +90 @@
                 }
             }
-            painter.drawArea((Way) osm, myColor, fillImage,
+            painter.drawArea((Way) osm, myColor, fillImage, fillImageAlpha,
                     painter.isShowNames() ? painter.getAreaName(osm) : null);
         } else if (osm instanceof Relation)
@@ -96 +100 @@
                 }
             }
-            painter.drawArea((Relation) osm, myColor, fillImage,
+            painter.drawArea((Relation) osm, myColor, fillImage, fillImageAlpha,
                     painter.getAreaName(osm));
         }
@@ -109 +113 @@
         AreaElemStyle other = (AreaElemStyle) obj;
         // we should get the same image object due to caching
-        if (fillImage != other.fillImage && (fillImage == null || other.fillImage == null || fillImage != other.fillImage))
+        if (fillImage != other.fillImage)
             return false;
         if (!Utils.equal(color, other.color))
+            return false;
+        if (fillImageAlpha != other.fillImageAlpha)
             return false;
         return true;
@@ -119 +125 @@
     public int hashCode() {
         int hash = 3;
-        hash = 61 * hash + (this.color != null ? this.color.hashCode() : 0);
-        hash = 61 * hash + (this.fillImage != null ? this.fillImage.hashCode() : 0);
+        hash = 61 * hash + color.hashCode();
+        hash = 61 * hash + (fillImage != null ? fillImage.hashCode() : 0);
+        hash = 61 * hash + Float.floatToIntBits(fillImageAlpha);
         return hash;
     }
@@ -126 +133 @@
     @Override
     public String toString() {
-        return "AreaElemStyle{" + super.toString() + "color=" + Utils.toString(color) + '}';
+        return "AreaElemStyle{" + super.toString() + "color=" + Utils.toString(color) +
+                " fillImageAlpha=" + fillImageAlpha + " fillImage=[" + fillImage + "]}";
     }
 }