Changeset 2392 in josm for trunk

Timestamp:

2009-11-05T20:33:45+01:00 (15 years ago)

Author:

bastiK

Message:

Objects on inactive osm-layers should be painted in a shade of gray.
(The same goes for filtered / deactivated primitives.)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MapPaintVisitor.java (modified) (6 diffs)
• gui/mappaint/IconElemStyle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -114 +114 @@
             return (styles != null) ? styles.getIcon(osm) : null;
 
-            if(osm.mappaintStyle == null && styles != null) {
-                osm.mappaintStyle = styles.getIcon(osm);
-            }
-
-            return (IconElemStyle)osm.mappaintStyle;
+        if(osm.mappaintStyle == null && styles != null) {
+            osm.mappaintStyle = styles.getIcon(osm);
+        }
+
+        return (IconElemStyle)osm.mappaintStyle;
     }
 
@@ -158 +158 @@
 
         if (nodeStyle != null && isZoomOk(nodeStyle) && showIcons > dist) {
-            drawNode(n, nodeStyle.icon, nodeStyle.annotate, data.isSelected(n));
+            if (inactive || n.isDisabled()) {
+                drawNode(n, nodeStyle.getDisabledIcon(), nodeStyle.annotate, data.isSelected(n));
+            } else {
+                drawNode(n, nodeStyle.icon, nodeStyle.annotate, data.isSelected(n));
+            }
         } else if (n.highlighted) {
             drawNode(n, highlightColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
@@ -165 +169 @@
         } else if (n.isTagged()) {
             drawNode(n, nodeColor, taggedNodeSize, taggedNodeRadius, fillUnselectedNode);
-        } else if (n.isDisabled()) {
+        } else if (inactive || n.isDisabled()) {
             drawNode(n, inactiveColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
         } else {
@@ -1251 +1255 @@
             if (name!=null && annotate)
             {
-                g.setColor(textColor);
+                if (inactive || n.isDisabled()) {
+                    g.setColor(inactiveColor);
+                } else {
+                    g.setColor(textColor);
+                }
                 Font defaultFont = g.getFont();
                 g.setFont (orderFont);
@@ -1371 +1379 @@
             //profilerVisibleNodes++;
 
-            g.setColor(color);
+            if (inactive || n.isDisabled()) {
+                g.setColor(inactiveColor);
+            } else {
+                g.setColor(color);
+            }
             if (fill) {
                 g.fillRect(p.x - radius, p.y - radius, size, size);
@@ -1384 +1396 @@
                 if (name!=null /* && annotate */)
                 {
-                    g.setColor(textColor);
+                    if (inactive || n.isDisabled()) {
+                        g.setColor(inactiveColor);
+                    } else {
+                        g.setColor(textColor);
+                    }
                     Font defaultFont = g.getFont();
                     g.setFont (orderFont);

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

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.mappaint;
+
+import javax.swing.GrayFilter;
 import javax.swing.ImageIcon;
 
@@ -5 +7 @@
 {
     public ImageIcon icon;
+    private ImageIcon disabledIcon;
     public boolean annotate;
 
@@ -17 +20 @@
     public IconElemStyle() { init(); }
 
-    public void init()
-    {
+    public void init() {
         icon = null;
         priority = 0;
         annotate = true;
     }
+    
+    public ImageIcon getDisabledIcon() {
+        if (disabledIcon != null)
+            return disabledIcon;
+        if (icon == null)
+            return null;
+        return disabledIcon = new ImageIcon(GrayFilter.createDisabledImage(icon.getImage()));
+    }
 }