Changeset 768 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2008-08-11T20:59:42+02:00 (16 years ago)

Author:

framm

Message:

• mappaint modifications by Joerg Henne <j.henne@…>; now supports new config options mappaint.node.selected-size and .unselected-size, .fill-selected and .fill-unselected, mappaint.segment.default-width; change in unselect_all (supports escape), new keyboard shortcuts for zoom in/out (keys + and -)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• osm/visitor/MapPaintVisitor.java (modified) (7 diffs)
• osm/visitor/SimplePaintVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -277 +277 @@
                 return ColorHelper.html2color(colStr);
         }
+
+        public int getInteger(String key, int def) {
+            String v = get(key);
+            if(null == v)
+                return def;
+            
+            try {
+                return Integer.parseInt(v);
+            } catch(NumberFormatException e) {
+                // fall out
+            }
+            
+            return def;
+    }
 }

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

@@ -9 +9 @@
 import java.awt.Point;
 import java.awt.Polygon;
+import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.geom.GeneralPath;
@@ -17 +18 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.UnselectAllAction;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -77 +79 @@
     protected boolean showOrderNumber;
     
+        private boolean fillSelectedNode;
+
+        private boolean fillUnselectedNode;
+
+        private int selectedNodeRadius;
+
+        private int unselectedNodeRadius;
+
+        private int selectedNodeSize;
+
+        private int unselectedNodeSize;
+
+        private int defaultSegmentWidth = 2;
+
     public final static Color darkerblue = new Color(0,0,96);
     public final static Color darkblue = new Color(0,0,128);
@@ -126 +142 @@
             }
         } else {
-            drawNode(n, n.selected ? selectedColor : nodeColor);
+                        if (n.selected)
+                                drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
+                        else
+                                drawNode(n, nodeColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
         }
     }
@@ -143 +162 @@
 
         Color colour = untaggedColor;
-        int width = 2;
+                int width = defaultSegmentWidth;
         int realWidth = 0; //the real width of the element in meters 
         boolean dashed = false;
@@ -326 +345 @@
      * @param color The color of the node.
      */
-    public void drawNode(Node n, Color color) {
-        if(isZoomOk(null)) {
-            Point p = nc.getPoint(n.eastNorth);
-            if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
-            g.setColor(color);
-            g.drawRect(p.x-1, p.y-1, 2, 2);
-        }
-    }
+    public void drawNode(Node n, Color color, int size, int radius, boolean fill) {
+                if (isZoomOk(null) && size > 1) {
+                        Point p = nc.getPoint(n.eastNorth);
+                        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth())
+                                || (p.y > nc.getHeight()))
+                                return;
+                        g.setColor(color);
+                        if (fill)
+                                g.fillRect(p.x - radius, p.y - radius, size, size);
+                        else
+                                g.drawRect(p.x - radius, p.y - radius, size, size);
+                }
+        }
 
     // NW 111106 Overridden from SimplePaintVisitor in josm-1.4-nw1
@@ -353 +377 @@
         fillAreas = Main.pref.getBoolean("mappaint.fillareas", true);
 
-        /* XXX - there must be a better way to get a bounded Integer pref! */
-        try {
-            fillAlpha = Integer.valueOf(Main.pref.get("mappaint.fillalpha", "50"));
-            if (fillAlpha < 0) {
-                fillAlpha = 0;
-            }
-            if (fillAlpha > 255) {
-                fillAlpha = 255;
-            }
-        } catch (NumberFormatException nfe) {
-            fillAlpha = 50;
-        }
+                selectedNodeRadius = Main.pref.getInteger("mappaint.node.selected-size",
+                        5) / 2;
+                selectedNodeSize = selectedNodeRadius * 2;
+                unselectedNodeRadius = Main.pref.getInteger(
+                        "mappaint.node.unselected-size", 3) / 2;
+                unselectedNodeSize = unselectedNodeRadius * 2;
+
+                defaultSegmentWidth = Main.pref.getInteger(
+                        "mappaint.segment.default-width", 2);
+
+                fillSelectedNode = Main.pref.getBoolean("mappaint.node.fill-selected",
+                        true);
+                fillUnselectedNode = Main.pref.getBoolean(
+                        "mappaint.node.fill-unselected", false);
+
+                ((Graphics2D)g)
+                        .setRenderingHint(
+                                RenderingHints.KEY_ANTIALIASING,
+                                Main.pref.getBoolean("mappaint.use-antialiasing", true) ? RenderingHints.VALUE_ANTIALIAS_ON
+                                        : RenderingHints.VALUE_ANTIALIAS_OFF);
+
+                fillAlpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref
+                        .getInteger("mappaint.fillalpha", 50))));
 
         Collection<Way> noAreaWays = new LinkedList<Way>();

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

@@ -8 +8 @@
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.geom.GeneralPath;
-
 import java.util.Iterator;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.tools.ColorHelper;
 
 /**
@@ -64 +65 @@
         protected boolean showOrderNumber;
         
+        private boolean fillSelectedNode;
+
+        private boolean fillUnselectedNode;
+
+        private int selectedNodeRadius;
+
+        private int unselectedNodeRadius;
+
+        private int selectedNodeSize;
+
+        private int unselectedNodeSize;
+
+        private int defaultSegmentWidth = 2;
+
         /**
          * Draw subsequent segments of same color as one Path
@@ -85 +100 @@
                 showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
                 
+                selectedNodeRadius = Main.pref.getInteger("mappaint.node.selected-size",
+                        5) / 2;
+                selectedNodeSize = selectedNodeRadius * 2;
+                unselectedNodeRadius = Main.pref.getInteger(
+                        "mappaint.node.unselected-size", 3) / 2;
+                unselectedNodeSize = unselectedNodeRadius * 2;
+
+                defaultSegmentWidth = Main.pref.getInteger(
+                        "mappaint.segment.default-width", 2);
+
+                fillSelectedNode = Main.pref.getBoolean("mappaint.node.fill-selected",
+                        true);
+                fillUnselectedNode = Main.pref.getBoolean(
+                        "mappaint.node.fill-unselected", false);
+
+                ((Graphics2D)g)
+                        .setRenderingHint(
+                                RenderingHints.KEY_ANTIALIASING,
+                                Main.pref.getBoolean("mappaint.use-antialiasing", true) ? RenderingHints.VALUE_ANTIALIAS_ON
+                                        : RenderingHints.VALUE_ANTIALIAS_OFF);
+
                 // draw tagged ways first, then untagged ways. takes
                 // time to iterate through list twice, OTOH does not
@@ -121 +157 @@
                 if (n.incomplete) return;
 
-                Color color = null;
                 if (inactive)
-                        color = inactiveColor;
+                        drawNode(n, inactiveColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
                 else if (n.selected)
-                        color = selectedColor;
+                        drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
                 else
-                        color = nodeColor;
-                drawNode(n, color);
+                        drawNode(n, nodeColor, unselectedNodeSize, unselectedNodeRadius, fillUnselectedNode);
         }
 
@@ -235 +269 @@
          * @param color The color of the node.
          */
-        public void drawNode(Node n, Color color) {
-                Point p = nc.getPoint(n.eastNorth);
-        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
-
-        g.setColor(color);
-
-        if (n.tagged) {
-            g.drawRect(p.x, p.y, 0, 0);
-            g.drawRect(p.x-2, p.y-2, 4, 4);
-        } else {
-            g.drawRect(p.x-1, p.y-1, 2, 2);
-        }
+        public void drawNode(Node n, Color color, int size, int radius, boolean fill) {
+                if (size > 1) {
+                        Point p = nc.getPoint(n.eastNorth);
+                        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth())
+                                || (p.y > nc.getHeight()))
+                                return;
+                        g.setColor(color);
+                        if (fill)
+                                g.fillRect(p.x - radius, p.y - radius, size, size);
+                        else
+                                g.drawRect(p.x - radius, p.y - radius, size, size);
+                }
         }