Changeset 6749 in josm

Timestamp:

2014-01-21T13:38:07+01:00 (11 years ago)

Author:

simon04

Message:

fix #9596 - MapCSS style: determine opacity/transparency of a color using alpha()

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/mappaint/mapcss/ExpressionFactory.java (modified) (3 diffs)
• tools/Utils.java (modified) (1 diff)

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

@@ -216 +216 @@
         /**
          * Get the value of the red color channel in the rgb color model
+         * @return the red color channel in the range [0;1]
          * @see java.awt.Color#getRed()
          */
@@ -224 +225 @@
         /**
          * Get the value of the green color channel in the rgb color model
+         * @return the green color channel in the range [0;1]
          * @see java.awt.Color#getGreen()
          */
@@ -232 +234 @@
         /**
          * Get the value of the blue color channel in the rgb color model
+         * @return the blue color channel in the range [0;1]
          * @see java.awt.Color#getBlue()
          */
         public static float blue(Color c) {
             return Utils.color_int2float(c.getBlue());
+        }
+
+        /**
+         * Get the value of the alpha channel in the rgba color model
+         * @return the alpha channel in the range [0;1]
+         * @see java.awt.Color#getAlpha()
+         */
+        public static float alpha(Color c) {
+            return Utils.color_int2float(c.getAlpha());
         }
 

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -257 +257 @@
 
     /**
-     * convert back
+     * convert integer range 0..255 to float range 0 <= x <= 1
+     * when dealing with colors and color alpha value
      */
     public static Float color_int2float(Integer val) {