Changeset 3180 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/SimpleNodeElemStyle.java

Timestamp:

2010-04-14T16:34:33+02:00 (14 years ago)

Author:

bastiK

Message:

applied #4876 - make size of tagged nodes configurable (patch by petschge)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/SimpleNodeElemStyle.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
+import java.awt.Color;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -16 +17 @@
     }
 
+    private static final int max(int a, int b, int c, int d) {
+        return Math.max(Math.max(a, b), Math.max(c, d));
+    }
+
     @Override
     public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, MapPainter painter,
@@ -21 +26 @@
         Node n = (Node)primitive;
         String name = painter.isShowNames()?painter.getNodeName(n):null;
+
+
         if (n.isHighlighted()) {
             painter.drawNode(n, settings.getHighlightColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name);
-        } else if (selected) {
-            painter.drawNode(n, settings.getSelectedColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name);
         } else {
-            painter.drawNode(
-                n,
-                (painter.isInactive() || n.isDisabled()) ? settings.getInactiveColor() : settings.getNodeColor(),
-                n.isJunctionNode() ? settings.getJunctionNodeSize() : settings.getUnselectedNodeSize(),
-                n.isTagged() ? settings.isFillTaggedNode() : settings.isFillUnselectedNode(),
-                name);
+
+            Color color;
+
+            if (painter.isInactive() || n.isDisabled()) {
+                color = settings.getInactiveColor();
+            } else if (selected) {
+                color = settings.getSelectedColor();
+            } else if (n.isConnectionNode()) {
+                if (n.isTagged()) {
+                    color = settings.getTaggedConnectionColor();
+                } else {
+                    color = settings.getConnectionColor();
+                }
+            } else {
+                if (n.isTagged()) {
+                    color = settings.getTaggedColor();
+                } else {
+                    color = settings.getNodeColor();
+                }
+            }
+
+            final int size = max((selected ? settings.getSelectedNodeSize() : 0),
+                                    (n.isTagged() ? settings.getTaggedNodeSize() : 0),
+                                    (n.isConnectionNode() ? settings.getConnectionNodeSize() : 0),
+                                    settings.getUnselectedNodeSize());
+
+            final boolean fill = (selected && settings.isFillSelectedNode()) ||
+                                    (n.isTagged() && settings.isFillTaggedNode()) ||
+                                    (n.isConnectionNode() && settings.isFillConnectionNode()) ||
+                                    settings.isFillUnselectedNode();
+
+            painter.drawNode(n, color, size, fill, name);
         }
     }