Changeset 6172 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2013-08-21T18:15:12+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8849:

• Used scaled down (16x16 pixels) of large (.svg) images if no size is explicitely defined
• rendering of emergency=aed with recently added svg
• optimizations/refactoring in icons rotating/rescaling code
• fix of various warnings, javadoc

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (modified) (5 diffs)

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

@@ -6 +6 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Stroke;
@@ -19 +20 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -25 +27 @@
  */
 public class NodeElemStyle extends ElemStyle implements StyleKeys {
-    public MapImage mapImage;
-    public Symbol symbol;
+    public final MapImage mapImage;
+    public final Symbol symbol;
+    
+    private Image enabledNodeIcon;
+    private Image disabledNodeIcon;
 
     public enum SymbolShape { SQUARE, CIRCLE, TRIANGLE, PENTAGON, HEXAGON, HEPTAGON, OCTAGON, NONAGON, DECAGON }
@@ -230 +235 @@
     }
 
+    private Image getRealNodeIcon(final Image image) {
+        final int maxSize = 16;
+        // Scale down large (.svg) images to 16x16 pixels if no size is explicitely specified
+        if ((mapImage.width  == -1 && image.getWidth(null) > maxSize) 
+         || (mapImage.height == -1 && image.getHeight(null) > maxSize)) {
+            return ImageProvider.createBoundedImage(image, maxSize);
+        } else {
+            return image;
+        }
+    }
+    
     @Override
     public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, StyledMapRenderer painter, boolean selected, boolean member) {
@@ -235 +251 @@
             Node n = (Node) primitive;
             if (mapImage != null && painter.isShowIcons()) {
-                painter.drawNodeIcon(n, (painter.isInactiveMode() || n.isDisabled()) ? mapImage.getDisabled() : mapImage.getImage(),
-                        Utils.color_int2float(mapImage.alpha), selected, member);
+                final Image nodeIcon;
+                if (painter.isInactiveMode() || n.isDisabled()) {
+                    if (disabledNodeIcon == null) {
+                        disabledNodeIcon = getRealNodeIcon(mapImage.getDisabled());
+                    }
+                    nodeIcon = disabledNodeIcon;
+                } else {
+                    if (enabledNodeIcon == null) {
+                        enabledNodeIcon = getRealNodeIcon(mapImage.getImage());
+                    }
+                    nodeIcon = enabledNodeIcon;
+                }
+                painter.drawNodeIcon(n, nodeIcon, Utils.color_int2float(mapImage.alpha), selected, member);
             } else if (symbol != null) {
                 Color fillColor = symbol.fillColor;