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

Timestamp:

2013-08-21T18:15:12+02:00 (13 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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/DialogsPanel.java (modified) (3 diffs)
• dialogs/ToggleDialog.java (modified) (4 diffs)
• mappaint/NodeElemStyle.java (modified) (5 diffs)
• widgets/TextContextualPopupMenu.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. See LICENSE file for details.
-
 package org.openstreetmap.josm.gui.dialogs;
 
@@ -11 +10 @@
 import javax.swing.JSplitPane;
 
-import org.openstreetmap.josm.gui.MultiSplitPane;
 import org.openstreetmap.josm.gui.MultiSplitLayout.Divider;
 import org.openstreetmap.josm.gui.MultiSplitLayout.Leaf;
 import org.openstreetmap.josm.gui.MultiSplitLayout.Node;
 import org.openstreetmap.josm.gui.MultiSplitLayout.Split;
-
-public class DialogsPanel extends JPanel {
+import org.openstreetmap.josm.gui.MultiSplitPane;
+import org.openstreetmap.josm.tools.Destroyable;
+
+public class DialogsPanel extends JPanel implements Destroyable {
     protected List<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
     protected MultiSplitPane mSpltPane = new MultiSplitPane();
@@ -292 +292 @@
     }
 
+    @Override
     public void destroy() {
         for (ToggleDialog t : allDialogs) {

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

@@ -13 +13 @@
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
-import java.awt.Image;
 import java.awt.Rectangle;
 import java.awt.Toolkit;
@@ -33 +32 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
@@ -462 +460 @@
 
             // scale down the dialog icon
-            ImageIcon inIcon = ImageProvider.get("dialogs", iconName);
-            ImageIcon smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
-            lblTitle = new JLabel("",smallIcon, JLabel.TRAILING);
+            lblTitle = new JLabel("", new ImageProvider("dialogs", iconName).setWidth(16).get(), JLabel.TRAILING);
             lblTitle.setIconTextGap(8);
 
@@ -500 +496 @@
             // show the pref button if applicable
             if (preferenceClass != null) {
-                inIcon = ImageProvider.get("preference");
-                smallIcon = new ImageIcon(inIcon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH));
-                JButton pref = new JButton(smallIcon);
+                JButton pref = new JButton(new ImageProvider("preference").setWidth(16).get());
                 pref.setToolTipText(tr("Open preferences for this panel"));
                 pref.setBorder(BorderFactory.createEmptyBorder());

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;

trunk/src/org/openstreetmap/josm/gui/widgets/TextContextualPopupMenu.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
@@ -149 +148 @@
             mi.setText(label);
             if (iconName != null && Main.pref.getBoolean("text.popupmenu.useicons", true)) {
-                ImageIcon icon = ImageProvider.get(iconName);
+                ImageIcon icon = new ImageProvider(iconName).setWidth(16).get();
                 if (icon != null) {
-                    mi.setIcon(new ImageIcon(icon.getImage().getScaledInstance(16 , 16, Image.SCALE_SMOOTH)));
+                    mi.setIcon(icon);
                 }
             }