Changeset 4087 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

Timestamp:

2011-05-15T23:51:25+02:00 (13 years ago)

Author:

bastiK

Message:

PaintVisitor refactoring, includes hook for external MapRenderers (author: Gubaer)

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java (moved) (moved from trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java ) (12 diffs)

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

@@ -1 +1 @@
 /* License: GPL. Copyright 2007 by Immanuel Scholz and others */
 package org.openstreetmap.josm.data.osm.visitor.paint;
-
-/* To enable debugging or profiling remove the double / signs */
 
 import java.awt.BasicStroke;
@@ -20 +18 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -26 +25 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 
 /**
- * A visitor that paints a simple scheme of every primitive it visits to a
+ * A map renderer that paints a simple scheme of every primitive it visits to a
  * previous set graphic environment.
  *
  * @author imi
  */
-public class SimplePaintVisitor extends AbstractVisitor implements PaintVisitor {
-    /**
-     * The environment to paint to.
-     */
-    protected Graphics2D g;
-    /**
-     * MapView to get screen coordinates.
-     */
-    protected NavigatableComponent nc;
-
-    public boolean inactive;
+public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor {
 
     /**
@@ -85 +74 @@
     protected GeneralPath currentPath = new GeneralPath();
 
+    /**
+     * {@inheritDoc}
+     */
+    public WireframeMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) {
+        super(g, nc, isInactiveMode);
+    }
+
     public void getColors()
     {
@@ -132 +128 @@
 
     DataSet ds;
-    public void visitAll(DataSet data, boolean virtual, Bounds bounds) {
+    public void render(DataSet data, boolean virtual, Bounds bounds) {
         BBox bbox = new BBox(bounds);
         this.ds = data;
-        //boolean profiler = Main.pref.getBoolean("simplepaint.profiler",false);
-        //long profilerStart = java.lang.System.currentTimeMillis();
-        //long profilerLast = profilerStart;
-        //int profilerN = 0;
-        //if(profiler)
-        //    System.out.println("Simplepaint Profiler");
-
         getSettings(virtual);
-
-        //if(profiler)
-        //{
-        //    System.out.format("Prepare  : %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
-        //    profilerLast = java.lang.System.currentTimeMillis();
-        //}
 
         /* draw tagged ways first, then untagged ways. takes
            time to iterate through list twice, OTOH does not
            require changing the colour while painting... */
-        //profilerN = 0;
         for (final OsmPrimitive osm: data.searchRelations(bbox)) {
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden()) {
                 osm.visit(this);
-                //        profilerN++;
-            }
-        }
-
-        //if(profiler)
-        //{
-        //    System.out.format("Relations: %4dms, n=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
-        //    profilerLast = java.lang.System.currentTimeMillis();
-        //}
-
-        //profilerN = 0;
+            }
+        }
+
         for (final OsmPrimitive osm:data.searchWays(bbox)){
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && osm.isTagged()) {
                 osm.visit(this);
-                //        profilerN++;
             }
         }
@@ -179 +152 @@
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden() && !osm.isTagged()) {
                 osm.visit(this);
-                //        profilerN++;
             }
         }
         displaySegments();
-
-        //if(profiler)
-        //{
-        //    System.out.format("Ways     : %4dms, n=%5d\n",
-        //        (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
-        //    profilerLast = java.lang.System.currentTimeMillis();
-        //}
-
-        //profilerN = 0;
         for (final OsmPrimitive osm : data.getSelected()) {
             if (!osm.isDeleted()) {
                 osm.visit(this);
-                //        profilerN++;
             }
         }
         displaySegments();
 
-        //if(profiler)
-        //{
-        //    System.out.format("Selected : %4dms, n=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
-        //    profilerLast = java.lang.System.currentTimeMillis();
-        //}
-
-        //profilerN = 0;
         for (final OsmPrimitive osm: data.searchNodes(bbox)) {
             if (!osm.isDeleted() && !ds.isSelected(osm) && !osm.isDisabledAndHidden())
             {
                 osm.visit(this);
-                //        profilerN++;
-            }
-        }
-
-        //if(profiler)
-        //{
-        //    System.out.format("Nodes    : %4dms, n=%5d\n",
-        //        (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
-        //    profilerLast = java.lang.System.currentTimeMillis();
-        //}
-
+            }
+        }
         drawVirtualNodes(data.searchWays(bbox));
-
-        //if(profiler)
-        //{
-        //    System.out.format("All      : %4dms\n", (profilerLast-profilerStart));
-        //}
     }
 
@@ -248 +189 @@
             Color color;
 
-            if (inactive || n.isDisabled()) {
+            if (isInactiveMode || n.isDisabled()) {
                 color = inactiveColor;
             } else if (ds.isSelected(n)) {
@@ -339 +280 @@
         Color wayColor;
 
-        if (inactive || w.isDisabled()) {
+        if (isInactiveMode || w.isDisabled()) {
             wayColor = inactiveColor;
         } else if(w.isHighlighted()) {
@@ -372 +313 @@
 
         Color col;
-        if (inactive || r.isDisabled()) {
+        if (isInactiveMode || r.isDisabled()) {
             col = inactiveColor;
         } else if (ds.isSelected(r)) {
@@ -415 +356 @@
         }
     }
+
+    @Override
+    public void visit(Changeset cs) {/* ignore */}
 
     /**
@@ -519 +463 @@
     }
 
-    public void setGraphics(Graphics2D g) {
-        this.g = g;
-    }
-
-    public void setNavigatableComponent(NavigatableComponent nc) {
-        this.nc = nc;
-    }
-
     protected void displaySegments() {
         displaySegments(null);
@@ -538 +474 @@
         }
     }
-
-    public void setInactive(boolean inactive) {
-        this.inactive = inactive;
-    }
 }