Changeset 3858 in josm

Timestamp:

Feb 5, 2011 6:28:47 PM (2 years ago)

Author:

bastiK

Message:

mapcss: support for opacity & icon-image

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPaintSettings.java (modified) (1 diff)
• data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• gui/mappaint/AreaElemStyle.java (modified) (2 diffs)
• gui/mappaint/Cascade.java (modified) (1 diff)
• gui/mappaint/ElemStyle.java (modified) (1 diff)
• gui/mappaint/LineElemStyle.java (modified) (2 diffs)
• gui/mappaint/MapPaintStyles.java (modified) (1 diff)
• gui/mappaint/mapcss/Environment.java (modified) (2 diffs)
• gui/mappaint/mapcss/Instruction.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)
• gui/mappaint/xml/XmlStyleSource.java (modified) (3 diffs)

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

@@ -108 +108 @@
     }
 
+    public Color getSelectedColor(int alpha) {
+        return new Color(selectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
+    }
+
     public Color getRelationSelectedColor() {
         return relationSelectedColor;
     }
 
+    public Color getRelationSelectedColor(int alpha) {
+        return new Color(relationSelectedColor.getRGB() & 0x00ffffff | (alpha << 24), true);
+    }
+
     public Color getHighlightColor() {
         return highlightColor;

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

@@ -277 +277 @@
     protected void drawArea(Polygon polygon, Color color, String name) {
 
-        /* set the opacity (alpha) level of the filled polygon */
-        g.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha));
+        g.setColor(color);
 
         if (outlineOnly) {

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

@@ -4 +4 @@
 import java.awt.Color;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -24 +25 @@
         if (color == null)
             return null;
+        int alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
+        Integer pAlpha = color_float2int(c.get("fill-opacity", null, float.class));
+        if (pAlpha != null) {
+            alpha = pAlpha;
+        }
+        color = new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha);
         return new AreaElemStyle(c, color);
     }
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
-        if (primitive instanceof Way) {
-            Way w = (Way) primitive;
-            String name = painter.isShowNames() ? painter.getAreaName(w) : null;
-            painter.drawArea(w, w.isSelected() ? paintSettings.getSelectedColor() : color, name);
-        } else if (primitive instanceof Relation) {
-            painter.drawArea((Relation) primitive, selected ? paintSettings.getRelationSelectedColor() : color, painter.getAreaName(primitive));
+    public void paintPrimitive(OsmPrimitive osm, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
+        if (osm instanceof Way)
+        {
+            painter.drawArea((Way) osm,
+                    osm.isSelected() ? paintSettings.getSelectedColor(color.getAlpha()) : color,
+                    painter.isShowNames() ? painter.getAreaName(osm) : null);
+        } else if (osm instanceof Relation)
+        {
+            painter.drawArea((Relation) osm,
+                    selected ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color,
+                    painter.getAreaName(osm));
         }
     }

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

@@ -160 +160 @@
             if (val instanceof float[]) {
                 res.append(Arrays.toString((float[]) val));
+            } else if (val instanceof Color) {
+                res.append(String.format("#%x", ((Color) val).getRGB()));
             } else {
                 res.append(val+"");

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

@@ -45 +45 @@
         return "";
     }
+
+    public static Integer color_float2int(Float val) {
+        if (val == null || val < 0 || val > 1)
+            return null;
+        return (int) (255f * val + 0.5f);
+    }
+    
+    public static Float color_int2float(Integer val) {
+        if (val == null || val < 0 || val > 255)
+            return null;
+        return ((float) val) / 255f;
+    }
 }

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

@@ -60 +60 @@
             color = PaintColors.UNTAGGED.get();
         }
+
+        int alpha = 255;
+        Integer pAlpha = color_float2int(c.get("opacity", null, float.class));
+        if (pAlpha != null) {
+            alpha = pAlpha;
+        }
+        color = new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha);
+
         float[] dashes = c.get(prefix + "dashes", null, float[].class);
         if (dashes != null) {
@@ -124 +132 @@
             markColor = paintSettings.getHighlightColor();
         } else if (selected) {
-            markColor = paintSettings.getSelectedColor();
+            markColor = paintSettings.getSelectedColor(color.getAlpha());
         } else if (member) {
-            markColor = paintSettings.getRelationSelectedColor();
+            markColor = paintSettings.getRelationSelectedColor(color.getAlpha());
         } else if(w.isDisabled()) {
             markColor = paintSettings.getInactiveColor();

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

@@ -47 +47 @@
 
         public String iconName;
-        public XmlStyleSource source;
-
-        public IconReference(String iconName, XmlStyleSource source) {
+        public StyleSource source;
+
+        public IconReference(String iconName, StyleSource source) {
             this.iconName = iconName;
             this.source = source;
+        }
+
+        @Override
+        public String toString() {
+            return "IconReference{" + "iconName=" + iconName + " source=" + source.getDisplayString() + '}';
         }
     }

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

@@ -5 +5 @@
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
+import org.openstreetmap.josm.gui.mappaint.StyleSource;
 
 public class Environment {
@@ -11 +12 @@
     MultiCascade mc;
     String layer;
+    StyleSource source;
 
-    public Environment(OsmPrimitive osm, MultiCascade mc, String layer) {
+    public Environment(OsmPrimitive osm, MultiCascade mc, String layer, StyleSource source) {
         this.osm = osm;
         this.mc = mc;
         this.layer = layer;
+        this.source = source;
     }
 

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

@@ -3 +3 @@
 
 import java.util.Arrays;
+
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 
 abstract public class Instruction {
@@ -32 +34 @@
         @Override
         public void execute(Environment env) {
-            if (val instanceof Expression) {
-                env.getCascade().putOrClear(key, ((Expression) val).evaluate(env));
-            } else {
-                env.getCascade().putOrClear(key, val);
+            Object value = (val instanceof Expression) ? ((Expression) val).evaluate(env) : val;
+            if (key.equals("icon-image")) {
+                if (value instanceof String) {
+                    value = new IconReference((String) value, env.source);
+                }
             }
+            env.getCascade().putOrClear(key, value);
         }
 

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

@@ -80 +80 @@
         n.put("lang", code);
         // create a fake environment to read the meta data block
-        Environment env = new Environment(n, mc, "default");
+        Environment env = new Environment(n, mc, "default", this);
 
         NEXT_RULE:
@@ -105 +105 @@
     @Override
     public void apply(MultiCascade mc, OsmPrimitive osm, double scale, OsmPrimitive multipolyOuterWay, boolean pretendWayIsClosed) {
-        Environment env = new Environment(osm, mc, null);
+        Environment env = new Environment(osm, mc, null, this);
         for (MapCSSRule r : rules) {
             for (Selector s : r.selectors) {

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
+import org.openstreetmap.josm.gui.mappaint.ElemStyle;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.gui.mappaint.Range;
@@ -300 +301 @@
                 def.putOrClear("real-width", p.line.realWidth != null ? new Float(p.line.realWidth) : null);
                 def.putOrClear("color", p.line.color);
+                if (p.line.color != null) {
+                    int alpha = p.line.color.getAlpha();
+                    if (alpha != 255) {
+                        def.put("opacity", ElemStyle.color_int2float(alpha));
+                    }
+                }
                 def.putOrClear("dashes", p.line.getDashed());
                 def.putOrClear("dashes-background-color", p.line.dashedColor);
@@ -323 +330 @@
                     c.put("width", new Float(mod.getWidth(refWidth)));
                     c.putOrClear("color", mod.color);
+                    if (mod.color != null) {
+                        int alpha = mod.color.getAlpha();
+                        if (alpha != 255) {
+                            c.put("opacity", ElemStyle.color_int2float(alpha));
+                        }
+                    }
                     c.putOrClear("dashes", mod.getDashed());
                     c.putOrClear("dashes-background-color", mod.dashedColor);