Changeset 35 in josm for src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

2005-12-28T01:29:01+01:00 (18 years ago)

Author:

imi

Message:

• fixed bug in UTM
• upload of nodes and segments
• fixed bugs in display the selection

Location:

src/org/openstreetmap/josm/data/osm/visitor

Files:

• AddVisitor.java (modified) (1 diff)
• BoundingVisitor.java (modified) (1 diff)
• DeleteVisitor.java (deleted)
• MergeVisitor.java (added)
• SimplePaintVisitor.java (modified) (5 diffs)

src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java

@@ -26 +26 @@
         public void visit(Node n) {
                 ds.nodes.add(n);
-                ds.deleted.remove(n); // remove if there.
+                n.setDeleted(false);
         }
         public void visit(LineSegment ls) {
                 ds.lineSegments.add(ls);
-                ds.deleted.remove(ls); // remove if there.
+                ls.setDeleted(false);
         }
         public void visit(Track t) {
                 ds.tracks.add(t);
-                ds.deleted.remove(t); // remove if there.
+                t.setDeleted(false);
         }
         public void visit(Key k) {}

src/org/openstreetmap/josm/data/osm/visitor/BoundingVisitor.java

@@ -21 +21 @@
          * Calculate regarding lat/lon or x/y?
          */
-        public static enum Type {LATLON, XY};
+        public static enum Type {LATLON, XY}
         private Type type;
-        
-        
+
+
         public BoundingVisitor(Type type) {
                 this.type = type;

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

@@ -30 +30 @@
          */
         private final MapView mv;
-        /**
-         * Can be set to non-<code>null</code> and then replace every other color.
-         */
-        private final Color forceColor;
         
         /**
@@ -39 +35 @@
          * @param g   The graphics to draw to.
          * @param mv  The view to get screen coordinates from.
-         * @param forceColor If non-<code>null</code>, always draw with this color.
          */
-        public SimplePaintVisitor(Graphics g, MapView mv, Color forceColor) {
+        public SimplePaintVisitor(Graphics g, MapView mv) {
                 this.g = g;
                 this.mv = mv;
-                this.forceColor = forceColor;
         }
         
@@ -70 +64 @@
          */
         public void visit(Track t) {
+                // only to overwrite with blue
                 for (LineSegment ls : t.segments)
-                        drawLineSegment(ls, darkblue);
+                        if (!ls.isSelected()) // selected already in good color
+                                drawLineSegment(ls, t.isSelected() ? Color.WHITE : darkblue);
         }
 
@@ -88 +84 @@
         private void drawNode(Node n, Color color) {
                 Point p = mv.getScreenPoint(n.coor);
-                g.setColor(forceColor != null ? forceColor : color);
+                g.setColor(color);
                 g.drawRect(p.x-1, p.y-1, 2, 2);
         }
@@ -96 +92 @@
          */
         private void drawLineSegment(LineSegment ls, Color col) {
-                if (forceColor != null)
-                        col = forceColor;
-                else if (ls.isSelected())
+                if (ls.isSelected())
                         col = Color.WHITE;
                 g.setColor(col);