Changeset 7136 in josm for trunk/src

Timestamp:

2014-05-17T23:52:55+02:00 (10 years ago)

Author:

bastiK

Message:

mapcss: add support for alpha info in color property, e.g.
color: #aa0022ee; or color: rgba(1.0, 0.2, 0.8, 0.8);
*opacity properties still have higher priority, if specified
explicitly

Location:

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

Files:

• AreaElemStyle.java (modified) (1 diff)
• LineElemStyle.java (modified) (3 diffs)
• NodeElemStyle.java (modified) (2 diffs)
• mapcss/ExpressionFactory.java (modified) (1 diff)

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

@@ -55 +55 @@
             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))));
+                int alpha = color.getAlpha();
+                if (alpha == 255) {
+                    // Assume alpha value has not been specified by the user if
+                    // is set to fully opaque. Use default value in this case.
+                    // It is not an ideal solution, but a little tricky to get this
+                    // right, especially as named map colors can be changed in
+                    // the preference GUI and written to the preferences file.
+                    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) {

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

@@ -24 +24 @@
         c.put(WIDTH, Keyword.DEFAULT);
         c.put(COLOR, color != null ? color : PaintColors.UNTAGGED.get());
+        c.put(OPACITY, 1f);
         if (isAreaEdge) {
             c.put(Z_INDEX, -3f);
@@ -169 +170 @@
         }
 
+        int alpha = 255;
         Color color = c.get(type.prefix + COLOR, null, Color.class);
+        if (color != null) {
+            alpha = color.getAlpha();
+        }
         if (type == LineType.NORMAL && color == null) {
             color = c.get(FILL_COLOR, null, Color.class);
@@ -177 +182 @@
         }
 
-        int alpha = 255;
         Integer pAlpha = Utils.color_float2int(c.get(type.prefix + OPACITY, null, Float.class));
         if (pAlpha != null) {

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

@@ -216 +216 @@
         Stroke stroke = null;
         if (strokeColor != null) {
-            float strokeAlpha = c.get("symbol-stroke-opacity", 1f, Float.class);
-            strokeColor = new Color(strokeColor.getRed(), strokeColor.getGreen(),
-                    strokeColor.getBlue(), Utils.color_float2int(strokeAlpha));
+            Integer strokeAlpha = Utils.color_float2int(c.get("symbol-stroke-opacity", null, Float.class));
+            if (strokeAlpha != null) {
+                strokeColor = new Color(strokeColor.getRed(), strokeColor.getGreen(),
+                        strokeColor.getBlue(), strokeAlpha);
+            }
             stroke = new BasicStroke(strokeWidth);
         }
@@ -228 +230 @@
 
         if (fillColor != null) {
-            float fillAlpha = c.get("symbol-fill-opacity", 1f, Float.class);
-            fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
-                    fillColor.getBlue(), Utils.color_float2int(fillAlpha));
+            Integer fillAlpha = Utils.color_float2int(c.get("symbol-fill-opacity", null, Float.class));
+            if (fillAlpha != null) {
+                fillColor = new Color(fillColor.getRed(), fillColor.getGreen(),
+                        fillColor.getBlue(), fillAlpha);
+            }
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -202 +202 @@
          */
         public static Color rgb(float r, float g, float b) {
-            Color c;
             try {
-                c = new Color(r, g, b);
+                return new Color(r, g, b);
             } catch (IllegalArgumentException e) {
                 return null;
             }
-            return c;
+        }
+        
+        public static Color rgba(float r, float g, float b, float alpha) {
+            try {
+                return new Color(r, g, b, alpha);
+            } catch (IllegalArgumentException e) {
+                return null;
+            }
         }