Changeset 329 in josm for branch/0.5/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

Timestamp:

2007-09-24T01:36:24+02:00 (17 years ago)

Author:

framm

Message:

This commit is a manual merge of all changes that have been made to
the intermediate "core_0.5" branch on the main OSM repository,
bevore JOSM was moved to openstreetmap.de.

Changes incorporated here:

r4464@svn.openstreetmap.org
r4466@svn.openstreetmap.org
r4468@svn.openstreetmap.org
r4469@svn.openstreetmap.org
r4479@svn.openstreetmap.org

File:

• branch/0.5/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java (modified) (8 diffs)

branch/0.5/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Graphics;
-import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -30 +28 @@
         public final static Color darkblue = new Color(0,0,128);
         public final static Color darkgreen = new Color(0,128,0);
-        
+
         /**
          * The environment to paint to.
@@ -41 +39 @@
         
         public boolean inactive;
-        
+
         protected static final double PHI = Math.toRadians(20);
 
-        /**
-         * Preferences
-         */
-        protected Color inactiveColor;
-        protected Color selectedColor;
-        protected Color nodeColor;
-        protected Color segmentColor;
-        protected Color dfltWayColor;
-        protected Color incompleteColor;
-        protected Color backgroundColor;
-        protected boolean showDirectionArrow;
-        protected boolean showOrderNumber;
-        
-        /**
-         * Draw subsequent segments of same color as one Path
-         */
-        protected Color currentColor = null;
-        protected GeneralPath currrentPath = new GeneralPath();
-        
         public void visitAll(DataSet data) {
-                inactiveColor = getPreferencesColor("inactive", Color.DARK_GRAY);
-                selectedColor = getPreferencesColor("selected", Color.WHITE);
-                nodeColor = getPreferencesColor("node", Color.RED);
-                segmentColor = getPreferencesColor("segment", darkgreen);
-                dfltWayColor = getPreferencesColor("way", darkblue);
-                incompleteColor = getPreferencesColor("incomplete way", darkerblue);
-                backgroundColor = getPreferencesColor("background", Color.BLACK);
-                showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
-                showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
-                
-                for (final OsmPrimitive osm : data.segments)
-                        if (!osm.deleted && !osm.selected)
-                                osm.visit(this);
                 for (final OsmPrimitive osm : data.ways)
                         if (!osm.deleted && !osm.selected)
                                 osm.visit(this);
-                displaySegments(null);  // Flush segment cache before nodes
                 for (final OsmPrimitive osm : data.nodes)
                         if (!osm.deleted && !osm.selected)
@@ -87 +52 @@
                         if (!osm.deleted)
                                 osm.visit(this);
-                displaySegments(null);
         }
 
@@ -99 +63 @@
                 Color color = null;
                 if (inactive)
-                        color = inactiveColor;
+                        color = getPreferencesColor("inactive", Color.DARK_GRAY);
                 else if (n.selected)
-                        color = selectedColor;
+                        color = getPreferencesColor("selected", Color.WHITE);
                 else
-                        color = nodeColor;
+                        color = getPreferencesColor("node", Color.RED);
                 drawNode(n, color);
-        }
-
-        /**
-         * Draw just a line between the points.
-         * White if selected (as always) or green otherwise.
-         */
-        public void visit(Segment ls) {
-                Color color;
-                if (inactive)
-                        color = inactiveColor;
-                else if (ls.selected)
-                        color = selectedColor;
-                else
-                        color = segmentColor;
-                drawSegment(ls, color, showDirectionArrow);
         }
 
@@ -129 +78 @@
                 Color wayColor;
                 if (inactive)
-                        wayColor = inactiveColor;
+                        wayColor = getPreferencesColor("inactive", Color.DARK_GRAY);
                 else {
-                        wayColor = dfltWayColor;
-                        for (Segment ls : w.segments) {
-                                if (ls.incomplete) {
-                                        wayColor = incompleteColor;
-                                        break;
-                                }
-                        }
+                        wayColor = getPreferencesColor("way", darkblue);
                 }
 
+                boolean showDirectionArrow = Main.pref.getBoolean("draw.segment.direction");
+                boolean showOrderNumber = Main.pref.getBoolean("draw.segment.order_number");
                 int orderNumber = 0;
-                for (Segment ls : w.segments) {
+                Node lastN = null;
+                for (Node n : w.nodes) {
+                        if (lastN == null) {
+                                lastN = n;
+                                continue;
+                        }
                         orderNumber++;
-                        if (!ls.selected) // selected already in good color
-                                drawSegment(ls, w.selected && !inactive ? selectedColor : wayColor, showDirectionArrow);
-                        if (!ls.incomplete && showOrderNumber)
-                                drawOrderNumber(ls, orderNumber);
+                        drawSegment(lastN, n, w.selected && !inactive ? getPreferencesColor("selected", Color.WHITE) : wayColor, showDirectionArrow);
+                        if (showOrderNumber)
+                                drawOrderNumber(lastN, n, orderNumber);
+                        lastN = n;
                 }
         }
 
+        public void visit(Relation e) {
+                // relations are not drawn.
+        }
         /**
-         * Draw an number of the order of the segment within the parents way
+         * Draw an number of the order of the two consecutive nodes within the
+         * parents way
          */
-        protected void drawOrderNumber(Segment ls, int orderNumber) {
+        protected void drawOrderNumber(Node n1, Node n2, int orderNumber) {
                 int strlen = (""+orderNumber).length();
-                Point p1 = nc.getPoint(ls.from.eastNorth);
-                Point p2 = nc.getPoint(ls.to.eastNorth);
+                Point p1 = nc.getPoint(n1.eastNorth);
+                Point p2 = nc.getPoint(n2.eastNorth);
                 int x = (p1.x+p2.x)/2 - 4*strlen;
                 int y = (p1.y+p2.y)/2 + 4;
@@ -163 +117 @@
                 if (screen.contains(x,y)) {
                         Color c = g.getColor();
-                        g.setColor(backgroundColor);
+                        g.setColor(getPreferencesColor("background", Color.BLACK));
                         g.fillRect(x-1, y-12, 8*strlen+1, 14);
                         g.setColor(c);
@@ -188 +142 @@
          * Draw a line with the given color.
          */
-        protected void drawSegment(Segment ls, Color col, boolean showDirection) {
-                if (ls.incomplete)
-                        return;
-                if (col != currentColor) {
-                        displaySegments(col);
-                }
+        protected void drawSegment(Node n1, Node n2, Color col, boolean showDirection) {
+                g.setColor(col);
+                Point p1 = nc.getPoint(n1.eastNorth);
+                Point p2 = nc.getPoint(n2.eastNorth);
                 
-                Point p1 = nc.getPoint(ls.from.eastNorth);
-                Point p2 = nc.getPoint(ls.to.eastNorth);
-                
-                Rectangle screen = g.getClipBounds();           
+                Rectangle screen = g.getClipBounds();
                 Line2D line = new Line2D.Double(p1.x, p1.y, p2.x, p2.y);
                 if (screen.contains(p1.x, p1.y, p2.x, p2.y) || screen.intersectsLine(line))
                 {
-                        currrentPath.moveTo(p1.x, p1.y);
-                        currrentPath.lineTo(p2.x, p2.y);
+                        g.drawLine(p1.x, p1.y, p2.x, p2.y);
         
                         if (showDirection) {
                                 double t = Math.atan2(p2.y-p1.y, p2.x-p1.x) + Math.PI;
-                                currrentPath.lineTo((int)(p2.x + 10*Math.cos(t-PHI)), (int)(p2.y + 10*Math.sin(t-PHI)));
-                                currrentPath.moveTo((int)(p2.x + 10*Math.cos(t+PHI)), (int)(p2.y + 10*Math.sin(t+PHI)));
-                                currrentPath.lineTo(p2.x, p2.y);                        }
-                }
-        }
-        
-        protected void displaySegments(Color newColor) {
-                if (currrentPath != null) {
-                        g.setColor(currentColor);
-                        ((Graphics2D) g).draw(currrentPath);
-                        currrentPath = new GeneralPath();
-                        currentColor = newColor;
+                        g.drawLine(p2.x,p2.y, (int)(p2.x + 10*Math.cos(t-PHI)), (int)(p2.y + 10*Math.sin(t-PHI)));
+                        g.drawLine(p2.x,p2.y, (int)(p2.x + 10*Math.cos(t+PHI)), (int)(p2.y + 10*Math.sin(t+PHI)));
+                        }
                 }
         }