Changeset 2 in josm for src/org/openstreetmap/josm/gui

Timestamp:

2005-09-29T00:33:19+02:00 (20 years ago)

Author:

imi

Message:

Added selection

Location:

src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (2 diffs)
• MapView.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/MapFrame.java

@@ -27 +27 @@
 import org.openstreetmap.josm.actions.DebugAction;
 import org.openstreetmap.josm.actions.MapMode;
+import org.openstreetmap.josm.actions.SelectionAction;
 import org.openstreetmap.josm.actions.ZoomAction;
 import org.openstreetmap.josm.data.Preferences;
@@ -125 +126 @@
                 toolBarActions.setFloatable(false);
                 toolBarActions.add(new IconToggleButton(new ZoomAction(this)));
+                toolBarActions.add(new IconToggleButton(new SelectionAction(this)));
                 toolBarActions.add(new IconToggleButton(new DebugAction(this)));
 

src/org/openstreetmap/josm/gui/MapView.java

@@ -4 +4 @@
 import java.awt.Component;
 import java.awt.Graphics;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ComponentEvent;
@@ -126 +127 @@
                 addComponentListener(this);
                 
+                // initialize the movement listener
+                new MapMover(this);
+                
                 // initialize the projection
                 setProjection(Main.pref.projection.clone());
@@ -152 +156 @@
                         getProjection().xy2latlon(p);
                 return p;
+        }
+        
+        /**
+         * Return the point on the screen where this GeoPoint would be.
+         * @param point The point, where this geopoint would be drawn.
+         * @return The point on screen where "point" would be drawn, relative
+         *              to the own top/left.
+         */
+        public Point getScreenPoint(GeoPoint point) {
+                GeoPoint p;
+                if (!Double.isNaN(point.x) && !Double.isNaN(point.y))
+                        p = point;
+                else {
+                        if (Double.isNaN(point.lat) || Double.isNaN(point.lon))
+                                throw new IllegalArgumentException("point: Either lat/lon or x/y must be set.");
+                        p = point.clone();
+                        projection.latlon2xy(p);
+                }
+                return new Point(toScreenX(p.x), toScreenY(p.y));
         }
         
@@ -225 +248 @@
                 
                 // draw tracks
-                g.setColor(Color.RED);
                 if (dataSet.tracks != null)
                         for (Track track : dataSet.tracks)
-                                for (LineSegment ls : track.segments)
+                                for (LineSegment ls : track.segments) {
+                                        g.setColor(ls.selected ? Color.WHITE : Color.GRAY);
                                         g.drawLine(toScreenX(ls.start.coor.x), toScreenY(ls.start.coor.y),
                                                         toScreenX(ls.end.coor.x), toScreenY(ls.end.coor.y));
+                                }
 
                 // draw nodes
-                g.setColor(Color.YELLOW);
                 for (Node w : dataSet.allNodes) {
+                        g.setColor(w.selected ? Color.WHITE : Color.RED);
                         g.drawArc(toScreenX(w.coor.x), toScreenY(w.coor.y), 3, 3, 0, 360);
                 }