Changeset 3862 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-02-06T15:48:58+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss: fill-image

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/InspectPrimitiveDialog.java (modified) (3 diffs)
• mappaint/AreaElemStyle.java (modified) (4 diffs)
• mappaint/MapPaintStyles.java (modified) (2 diffs)
• mappaint/NodeElemStyle.java (modified) (1 diff)
• mappaint/mapcss/Instruction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -7 +7 @@
 import java.awt.Font;
 import java.awt.GridBagLayout;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -34 +35 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
+import org.openstreetmap.josm.gui.mappaint.StyleCache;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
@@ -300 +302 @@
             txtMappaint.append("\n\n");
         }
+
+        if (sel.size() == 2) {
+            List<OsmPrimitive> selList = new ArrayList<OsmPrimitive>(sel);
+            StyleCache sc1 = selList.get(0).mappaintStyle;
+            StyleCache sc2 = selList.get(1).mappaintStyle;
+            if (sc1 == sc2) {
+                txtMappaint.append("The 2 selected Objects have identical style caches.");
+            }
+            if (!sc1.equals(sc2)) {
+                txtMappaint.append("The 2 selected Objects have different style caches.");
+            }
+            if (sc1.equals(sc2) && sc1 != sc2) {
+                txtMappaint.append("Warning: The 2 selected Objects have equal, but not identical style caches.");
+            }
+        }
     }
 

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

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.awt.Rectangle;
+import java.awt.TexturePaint;
+import java.awt.image.BufferedImage;
+
+import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.Main;
@@ -10 +15 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.tools.Utils;
+
 
 public class AreaElemStyle extends ElemStyle
 {
     public Color color;
+    public BufferedImage fillImage;
 
-    protected AreaElemStyle(Cascade c, Color color) {
+    protected AreaElemStyle(Cascade c, Color color, BufferedImage fillImage) {
         super(c);
         this.color = color;
+        this.fillImage = fillImage;
     }
 
     public static AreaElemStyle create(Cascade c) {
+        BufferedImage fillImage = null;
+        IconReference iconRef = c.get("fill-image", null, IconReference.class);
+        if (iconRef != null) {
+            ImageIcon icon = MapPaintStyles.getIcon(iconRef, false);
+            if (icon != null) {
+                if (!(icon.getImage() instanceof BufferedImage)) {
+                    icon = MapPaintStyles.getIcon(iconRef, true);
+                }
+                if (!(icon.getImage() instanceof BufferedImage))
+                    throw new RuntimeException();
+                fillImage = (BufferedImage) icon.getImage();
+            }
+        }
+
         Color color = c.get("fill-color", null, Color.class);
-        if (color == null)
+        if (color != 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);
+        }
+        
+        if (fillImage != null || color != null)
+            return new AreaElemStyle(c, color, fillImage);
+        else
             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);
     }
 
@@ -38 +66 @@
         if (osm instanceof Way)
         {
-            painter.drawArea((Way) osm,
-                    osm.isSelected() ? paintSettings.getSelectedColor(color.getAlpha()) : color,
+            Color myColor = color;
+            if (color != null) {
+                if (osm.isSelected()) {
+                    myColor = paintSettings.getSelectedColor(color.getAlpha());
+                }
+            }
+            painter.drawArea((Way) osm, myColor, fillImage,
                     painter.isShowNames() ? painter.getAreaName(osm) : null);
         } else if (osm instanceof Relation)
         {
-            painter.drawArea((Relation) osm,
-                    selected ? paintSettings.getRelationSelectedColor(color.getAlpha()) : color,
+            Color myColor = color;
+            if (color != null) {
+                if (selected) {
+                    myColor = paintSettings.getRelationSelectedColor(color.getAlpha());
+                }
+            }
+            painter.drawArea((Relation) osm, myColor, fillImage,
                     painter.getAreaName(osm));
         }
@@ -55 +93 @@
         if (!super.equals(obj))
             return false;
-        return Utils.equal(color, ((AreaElemStyle) obj).color);
+        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))
+            return false;
+        if (!Utils.equal(color, other.color))
+            return false;
+        return true;
     }
 
     @Override
     public int hashCode() {
-        return 11 * super.hashCode() + color.hashCode();
+        int hash = 3;
+        hash = 61 * hash + (this.color != null ? this.color.hashCode() : 0);
+        hash = 61 * hash + (this.fillImage != null ? this.fillImage.hashCode() : 0);
+        return hash;
     }
 

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

@@ -60 +60 @@
     }
 
-    public static ImageIcon getIcon(IconReference ref)
+    public static ImageIcon getIcon(IconReference ref, boolean sanitize)
     {
         String styleName = ref.source.getPrefName();
@@ -78 +78 @@
             }
         }
-        ImageIcon i = ImageProvider.getIfAvailable(dirs, "mappaint."+styleName, null, ref.iconName, ref.source.zipIcons);
+        ImageIcon i = ImageProvider.getIfAvailable(dirs, "mappaint."+styleName, null, ref.iconName, ref.source.zipIcons, sanitize);
         if(i == null)
         {

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

@@ -37 +37 @@
         if (iconRef == null)
             return null;
-
-        ImageIcon icon = MapPaintStyles.getIcon(iconRef);
+        ImageIcon icon = MapPaintStyles.getIcon(iconRef, false);
+        
         String text = c.get("text", null, String.class);
 

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

@@ -36 +36 @@
         public void execute(Environment env) {
             Object value = (val instanceof Expression) ? ((Expression) val).evaluate(env) : val;
-            if (key.equals("icon-image")) {
+            if (key.equals("icon-image") || key.equals("fill-image")) {
                 if (value instanceof String) {
                     value = new IconReference((String) value, env.source);