Changeset 2671 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java

Timestamp:

2009-12-22T09:13:07+01:00 (14 years ago)

Author:

jttt

Message:

Make MapPaintVisitor independent of SimplePaintVisitor

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) (15 diffs)

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

@@ -7 +7 @@
 
 import java.awt.Color;
+import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Polygon;
+import java.awt.Rectangle;
 import java.awt.geom.Point2D;
 import java.util.ArrayList;
@@ -32 +34 @@
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
 import org.openstreetmap.josm.gui.mappaint.ElemStyle;
@@ -40 +43 @@
 import org.openstreetmap.josm.tools.LanguageInfo;
 
-public class MapPaintVisitor extends SimplePaintVisitor {
+public class MapPaintVisitor implements PaintVisitor {
+
+    protected Graphics2D g;
+    protected NavigatableComponent nc;
+
     protected boolean useRealWidth;
     protected boolean zoomLevelDisplay;
@@ -63 +70 @@
     protected Collection<String> regionalNameOrder;
 
+    public boolean inactive;
+    protected boolean fillSelectedNode;
+    protected boolean fillUnselectedNode;
+    protected int defaultSegmentWidth;
+    protected boolean showOrderNumber;
+
+    protected boolean showRelevantDirectionsOnly;
+    protected boolean showHeadArrowOnly;
+    protected boolean showDirectionArrow;
+
+    protected int selectedNodeRadius;
+    protected int selectedNodeSize;
+    protected int taggedNodeSize;
+    protected int taggedNodeRadius;
+    protected int unselectedNodeRadius;
+    protected int unselectedNodeSize;
+
+    protected Color selectedColor;
+    protected Color highlightColor;
+    protected Color inactiveColor;
+    protected Color nodeColor;
+
     protected boolean isZoomOk(ElemStyle e) {
         if (!zoomLevelDisplay) /* show everything if the user wishes so */
@@ -108 +137 @@
     }
 
-    /**
-     * Draw a small rectangle.
-     * White if selected (as always) or red otherwise.
-     *
-     * @param n The node to draw.
-     */
-    @Override
-    public void visit(Node n) {}
     public void drawNode(Node n) {
         /* check, if the node is visible at all */
@@ -151 +172 @@
     }
 
-    /**
-     * Draw a line for all segments, according to tags.
-     * @param w The way to draw.
-     */
-    @Override
-    public void visit(Way w) {}
     public void drawWay(Way w, int fillAreas) {
         if(w.getNodesCount() < 2)
@@ -453 +468 @@
     }
 
-    @Override
-    public void visit(Relation r) {}
     public void paintUnselectedRelation(Relation r) {
 
@@ -982 +995 @@
     }
 
+    protected boolean isPolygonVisible(Polygon polygon) {
+        Rectangle bounds = polygon.getBounds();
+        if (bounds.width == 0 && bounds.height == 0) return false;
+        if (bounds.x > nc.getWidth()) return false;
+        if (bounds.y > nc.getHeight()) return false;
+        if (bounds.x + bounds.width < 0) return false;
+        if (bounds.y + bounds.height < 0) return false;
+        return true;
+    }
+
     protected Polygon getPolygon(Way w)
     {
@@ -1054 +1077 @@
     }
 
-    @Override
-    public void getColors()
-    {
-        super.getColors();
+    public void getColors() {
+        selectedColor  = PaintColors.SELECTED.get();
+        highlightColor = PaintColors.HIGHLIGHT.get();
+        inactiveColor = PaintColors.INACTIVE.get();
+        nodeColor = PaintColors.NODE.get();
         untaggedColor = PaintColors.UNTAGGED.get();
         textColor = PaintColors.TEXT.get();
@@ -1083 +1107 @@
 
     /* Shows areas before non-areas */
-    @Override
     public void visitAll(DataSet data, boolean virtual, Bounds bounds) {
         BBox bbox = new BBox(bounds);
@@ -1098 +1121 @@
         dist = ll1.greatCircleDistance(ll2);
 
-        getSettings(virtual);
+        getColors();
+
+        showDirectionArrow = Main.pref.getBoolean("draw.segment.direction", true);
+        showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only", true);
+        showHeadArrowOnly = Main.pref.getBoolean("draw.segment.head_only", false);
+        showOrderNumber = Main.pref.getBoolean("draw.segment.order_number", false);
+        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;
+        taggedNodeRadius = Main.pref.getInteger("mappaint.node.tagged-size", 5) / 2;
+        taggedNodeSize = taggedNodeRadius * 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);
+
         useRealWidth = Main.pref.getBoolean("mappaint.useRealWidth", false);
         zoomLevelDisplay = Main.pref.getBoolean("mappaint.zoomLevelDisplay", false);
@@ -1111 +1149 @@
         regionalNameOrder = Main.pref.getCollection("mappaint.nameOrder", Arrays.asList(names));
 
-        this.painter = new MapPainter(g, inactive, nc, useStrokes > dist);
+        this.painter = new MapPainter(g, inactive, nc, useStrokes > dist, virtual);
 
         data.clearErrors();
@@ -1194 +1232 @@
         }
 
-        drawVirtualNodes(data.searchWays(bbox));
+        painter.drawVirtualNodes(data.searchWays(bbox));
     }
 
@@ -1204 +1242 @@
         Point p1 = nc.getPoint(n1);
         Point p2 = nc.getPoint(n2);
-        drawOrderNumber(p1, p2, orderNumber);
+        painter.drawOrderNumber(p1, p2, orderNumber);
     }
 
@@ -1211 +1249 @@
         data.addError(p, isError ? tr("Error: {0}", text) : tr("Warning: {0}", text));
     }
+
+    public void setGraphics(Graphics2D g) {
+        this.g = g;
+    }
+
+    public void setInactive(boolean inactive) {
+        this.inactive = inactive;
+    }
+
+    public void setNavigatableComponent(NavigatableComponent nc) {
+        this.nc = nc;
+    }
 }