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

Timestamp:

2005-10-02T20:32:00+02:00 (19 years ago)

Author:

imi

Message:

added mapmodes for adding and combining stuff. Reorganized images

Location:

src/org/openstreetmap/josm/gui

Files:

• IconToggleButton.java (modified) (3 diffs)
• Main.java (modified) (4 diffs)
• MapFrame.java (modified) (4 diffs)
• MapView.java (modified) (7 diffs)
• SelectionManager.java (modified) (12 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.gui;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 import javax.swing.Action;
@@ -11 +14 @@
  * @author imi
  */
-public class IconToggleButton extends JToggleButton {
+public class IconToggleButton extends JToggleButton implements PropertyChangeListener {
 
         /**
@@ -19 +22 @@
                 super(action);
                 setText(null);
+                
+                // Tooltip
+                String toolTipText = "";
                 Object o = action.getValue(Action.LONG_DESCRIPTION);
                 if (o != null)
-                        setToolTipText(o.toString());
+                        toolTipText += o.toString();
+                o = action.getValue(Action.ACCELERATOR_KEY);
+                if (o != null) {
+                        String ksName = o.toString();
+                        if (ksName.startsWith("pressed "))
+                                ksName = ksName.substring("pressed ".length());
+                        else if (ksName.startsWith("released "))
+                                ksName = ksName.substring("released ".length());
+                        toolTipText += " Shortcut: "+ksName;
+                }
+                setToolTipText(toolTipText);
+                
+                action.addPropertyChangeListener(this);
+        }
+
+        public void propertyChange(PropertyChangeEvent evt) {
+                if (evt.getPropertyName() == "active")
+                        setSelected((Boolean)evt.getNewValue());
         }
 }

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

@@ -62 +62 @@
                 setExtendedState(MAXIMIZED_BOTH); // some platform are able to maximize
                 
+                // creating actions
+                OpenGpxAction openGpxAction = new OpenGpxAction();
+                SaveGpxAction saveGpxAction = new SaveGpxAction();
+                ExitAction exitAction = new ExitAction();
+                PreferencesAction preferencesAction = new PreferencesAction();
+
                 // creating menu
                 JMenuBar mainMenu = new JMenuBar();
@@ -68 +74 @@
                 JMenu fileMenu = new JMenu("Files");
                 fileMenu.setMnemonic('F');
-                fileMenu.add(new OpenGpxAction());
-                fileMenu.add(new SaveGpxAction());
+                fileMenu.add(openGpxAction);
+                fileMenu.add(saveGpxAction);
                 fileMenu.addSeparator();
-                fileMenu.add(new ExitAction());
+                fileMenu.add(exitAction);
                 mainMenu.add(fileMenu);
                 
                 JMenu editMenu = new JMenu("Edit");
                 editMenu.setMnemonic('E');
-                editMenu.add(new PreferencesAction());
+                editMenu.add(preferencesAction);
                 mainMenu.add(editMenu);
 
@@ -82 +88 @@
                 JToolBar toolBar = new JToolBar();
                 toolBar.setFloatable(false);
-                toolBar.add(new OpenGpxAction());
-                toolBar.add(new SaveGpxAction());
+                toolBar.add(openGpxAction);
+                toolBar.add(saveGpxAction);
                 toolBar.addSeparator();
-                toolBar.add(new PreferencesAction());
+                toolBar.add(preferencesAction);
                 
                 getContentPane().add(toolBar, BorderLayout.NORTH);
@@ -133 +139 @@
                 this.name = name;
                 this.mapFrame = mapFrame;
+                panel.setVisible(false);
                 panel.removeAll();
                 panel.add(mapFrame, BorderLayout.CENTER);
                 panel.add(mapFrame.getToolBarActions(), BorderLayout.WEST);
+                panel.setVisible(true);
         }
         /**

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

@@ -25 +25 @@
 import javax.swing.event.ChangeListener;
 
+import org.openstreetmap.josm.actions.mapmode.AddLineSegmentAction;
+import org.openstreetmap.josm.actions.mapmode.AddNodeAction;
+import org.openstreetmap.josm.actions.mapmode.AddTrackAction;
+import org.openstreetmap.josm.actions.mapmode.CombineAction;
 import org.openstreetmap.josm.actions.mapmode.DebugAction;
+import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
+import org.openstreetmap.josm.actions.mapmode.MoveAction;
 import org.openstreetmap.josm.actions.mapmode.SelectionAction;
 import org.openstreetmap.josm.actions.mapmode.ZoomAction;
@@ -39 +45 @@
  * @author imi
  */
-public class MapFrame extends JComponent {
+public class MapFrame extends JPanel {
 
         /**
@@ -123 +129 @@
 
                 add(mapView = new MapView(dataSet), BorderLayout.CENTER);
-                
+
+                // toolbar
                 toolBarActions.setFloatable(false);
                 toolBarActions.add(new IconToggleButton(this, new ZoomAction(this)));
                 toolBarActions.add(new IconToggleButton(this, new SelectionAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new MoveAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new AddNodeAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new AddLineSegmentAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new AddTrackAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new CombineAction(this)));
+                toolBarActions.add(new IconToggleButton(this, new DeleteAction(this)));
                 toolBarActions.add(new IconToggleButton(this, new DebugAction(this)));
 
@@ -159 +172 @@
         public void selectMapMode(MapMode mapMode) {
                 if (this.mapMode != null)
-                        this.mapMode.unregisterListener(mapView);
+                        this.mapMode.unregisterListener();
                 this.mapMode = mapMode;
-                mapMode.registerListener(mapView);
+                mapMode.registerListener();
         }
 

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.LineSegment;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Track;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -81 +82 @@
 
         
-        // Event handling functions and data
-        
-        /**
-         * The event list with all state chaned listener
-         */
-        List<ChangeListener> listener = new LinkedList<ChangeListener>();
-        /**
-         * Add an event listener to the state changed event queue. If passed 
-         * <code>null</code>, nothing happens.
-         */
-        public final void addChangeListener(ChangeListener l) {
-                if (l != null)
-                        listener.add(l);
-        }
-        /**
-         * Remove an event listener from the event queue. If passed 
-         * <code>null</code>, nothing happens.
-         */
-        public final void removeChangeListener(ChangeListener l) {
-                listener.remove(l);
-        }
-        /**
-         * Fires an ChangeEvent. Occours, when an non-data value changed, as example
-         * the autoScale - state or the center. Is not fired, dataSet internal things
-         * changes.
-         */
-        public final void fireStateChanged() {
-                ChangeEvent e = null;
-                for(ChangeListener l : listener) {
-                        if (e == null)
-                                e = new ChangeEvent(this);
-                        l.stateChanged(e);
-                }
-        }
-        
-        
-        
-        
-        
-        // other functions
-        
         /**
          * Construct a MapView and attach it to a frame.
@@ -178 +138 @@
                 return new Point(toScreenX(p.x), toScreenY(p.y));
         }
-        
+
+        /**
+         * Return the object, that is nearest to the given screen point.
+         * 
+         * First, a node will be searched. If a node within 10 pixel is found, the
+         * nearest node is returned.
+         * 
+         * If no node is found, search for pending line segments.
+         * 
+         * If no such line segment is found, and a non-pending line segment is 
+         * within 10 pixel to p, this segment is returned, except when 
+         * <code>wholeTrack</code> is <code>true</code>, in which case the 
+         * corresponding Track is returned.
+         * 
+         * If no line segment is found and the point is within an area, return that
+         * area.
+         * 
+         * If no area is found, return <code>null</code>.
+         * 
+         * @param p                             The point on screen.
+         * @param wholeTrack    Whether the whole track or only the line segment
+         *                                              should be returned.
+         * @return      The primitive, that is nearest to the point p.
+         */
+        public OsmPrimitive getNearest(Point p, boolean wholeTrack) {
+                double minDistanceSq = Double.MAX_VALUE;
+                OsmPrimitive minPrimitive = null;
+                
+                // nodes
+                for (Node n : dataSet.nodes) {
+                        Point sp = getScreenPoint(n.coor);
+                        double dist = p.distanceSq(sp);
+                        if (minDistanceSq > dist && dist < 100) {
+                                minDistanceSq = p.distanceSq(sp);
+                                minPrimitive = n;
+                        }
+                }
+                if (minPrimitive != null)
+                        return minPrimitive;
+                
+                // pending line segments
+                for (LineSegment ls : dataSet.pendingLineSegments) {
+                        Point A = getScreenPoint(ls.start.coor);
+                        Point B = getScreenPoint(ls.end.coor);
+                        double c = A.distanceSq(B);
+                        double a = p.distanceSq(B);
+                        double b = p.distanceSq(A);
+                        double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
+                        if (perDist < 100 && minDistanceSq > perDist && a < c+100 && b < c+100) {
+                                minDistanceSq = perDist;
+                                minPrimitive = ls;
+                        }
+                }
+
+                // tracks & line segments
+                minDistanceSq = Double.MAX_VALUE;
+                for (Track t : dataSet.tracks) {
+                        for (LineSegment ls : t.segments) {
+                                Point A = getScreenPoint(ls.start.coor);
+                                Point B = getScreenPoint(ls.end.coor);
+                                double c = A.distanceSq(B);
+                                double a = p.distanceSq(B);
+                                double b = p.distanceSq(A);
+                                double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
+                                if (perDist < 100 && minDistanceSq > perDist && a < c+100 && b < c+100) {
+                                        minDistanceSq = perDist;
+                                        minPrimitive = wholeTrack ? t : ls;
+                                }
+                        }                       
+                }
+                if (minPrimitive != null)
+                        return minPrimitive;
+                
+                // TODO areas
+                
+                
+                return null; // nothing found
+        }
+
         /**
          * Zoom to the given coordinate.
@@ -220 +258 @@
                                 center = new GeoPoint(51.526447, -0.14746371);
                                 getProjection().latlon2xy(center);
-                                scale = 10000; // nice view from 1:10000, eh?
+                                scale = 10;
                         } else {
                                 center = bounds.centerXY();
@@ -258 +296 @@
                                 }
 
+                // draw pending line segments
+                for (LineSegment ls : dataSet.pendingLineSegments) {
+                        g.setColor(ls.selected ? Color.WHITE : Color.LIGHT_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
                 Set<Integer> alreadyDrawn = new HashSet<Integer>();
                 int width = getWidth();
-                for (Node w : dataSet.allNodes) {
+                for (Node w : dataSet.nodes) {
                         g.setColor(w.selected ? Color.WHITE : Color.RED);
                         int x = toScreenX(w.coor.x);
@@ -294 +339 @@
         }
 
-        /**
-         * Does nothing. Just to satisfy ComponentListener.
-         */
-        public void componentMoved(ComponentEvent e) {}
-        /**
-         * Does nothing. Just to satisfy ComponentListener.
-         */
-        public void componentShown(ComponentEvent e) {}
-        /**
-         * Does nothing. Just to satisfy ComponentListener.
-         */
-        public void componentHidden(ComponentEvent e) {}
-
+
+        // Event handling functions and data
+        
+        /**
+         * The event list with all state chaned listener
+         */
+        List<ChangeListener> listener = new LinkedList<ChangeListener>();
+        /**
+         * Add an event listener to the state changed event queue. If passed 
+         * <code>null</code>, nothing happens.
+         */
+        public final void addChangeListener(ChangeListener l) {
+                if (l != null)
+                        listener.add(l);
+        }
+        /**
+         * Remove an event listener from the event queue. If passed 
+         * <code>null</code>, nothing happens.
+         */
+        public final void removeChangeListener(ChangeListener l) {
+                listener.remove(l);
+        }
+        /**
+         * Fires an ChangeEvent. Occours, when an non-data value changed, as example
+         * the autoScale - state or the center. Is not fired, dataSet internal things
+         * changes.
+         */
+        public final void fireStateChanged() {
+                ChangeEvent e = null;
+                for(ChangeListener l : listener) {
+                        if (e == null)
+                                e = new ChangeEvent(this);
+                        l.stateChanged(e);
+                }
+        }
+        
         /**
          * Notify from the projection, that something has changed.
@@ -363 +431 @@
                 return center.clone();
         }
+
+        /**
+         * Does nothing. Just to satisfy ComponentListener.
+         */
+        public void componentMoved(ComponentEvent e) {}
+        /**
+         * Does nothing. Just to satisfy ComponentListener.
+         */
+        public void componentShown(ComponentEvent e) {}
+        /**
+         * Does nothing. Just to satisfy ComponentListener.
+         */
+        public void componentHidden(ComponentEvent e) {}
 }

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

@@ -10 +10 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.openstreetmap.josm.data.osm.LineSegment;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Track;
 
 /**
@@ -36 +45 @@
  * @author imi
  */
-public class SelectionManager implements MouseListener, MouseMotionListener {
+public class SelectionManager implements MouseListener, MouseMotionListener, PropertyChangeListener {
 
         /**
@@ -47 +56 @@
                  * Called, when the left mouse button was released.
                  * @param r The rectangle, that is currently the selection.
-                 * @param modifiers The modifiers returned from the MouseEvent when
-                 *              the left mouse button was released. 
+                 * @param alt Whether the alt key was pressed
+                 * @param shift Whether the shift key was pressed
+                 * @param ctrl Whether the ctrl key was pressed 
                  * @see InputEvent#getModifiersEx()
                  */
-                public void selectionEnded(Rectangle r, int modifiers);
+                public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl);
+                /**
+                 * Called to register the selection manager for "active" property.
+                 * @param listener The listener to register
+                 */
+                public void addPropertyChangeListener(PropertyChangeListener listener);
+                /**
+                 * Called to remove the selection manager from the listener list 
+                 * for "active" property.
+                 * @param listener The listener to register
+                 */
+                public void removePropertyChangeListener(PropertyChangeListener listener);
         }
         /**
@@ -67 +88 @@
         private Point mousePos;
         /**
-         * The component, the selection rectangle is drawn onto.
-         */
-        private final Component drawComponent;
+         * The MapView, the selection rectangle is drawn onto.
+         */
+        private final MapView mv;
         /**
          * Whether the selection rectangle must obtain the aspect ratio of the 
@@ -83 +104 @@
          * @param aspectRatio If true, the selection window must obtain the aspect
          *              ratio of the drawComponent.
-         * @param drawComponent The component, the rectangle is drawn onto.
-         */
-        public SelectionManager(SelectionEnded selectionEndedListener, boolean aspectRatio, Component drawComponent) {
+         * @param mapView The view, the rectangle is drawn onto.
+         */
+        public SelectionManager(SelectionEnded selectionEndedListener, boolean aspectRatio, MapView mapView) {
                 this.selectionEndedListener = selectionEndedListener;
                 this.aspectRatio = aspectRatio;
-                this.drawComponent = drawComponent;
+                this.mv = mapView;
         }
         
@@ -98 +119 @@
                 eventSource.addMouseListener(this);
                 eventSource.addMouseMotionListener(this);
+                selectionEndedListener.addPropertyChangeListener(this);
         }
         /**
@@ -108 +130 @@
                 eventSource.removeMouseListener(this);
                 eventSource.removeMouseMotionListener(this);
+                selectionEndedListener.removePropertyChangeListener(this);
         }
 
@@ -158 +181 @@
                 mousePosStart = null;
                 mousePos = null;
+
+                boolean shift = (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0;
+                boolean alt = (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0;
+                boolean ctrl = (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0;
                 if ((e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0)
-                        selectionEndedListener.selectionEnded(r, e.getModifiersEx());
+                        selectionEndedListener.selectionEnded(r, alt, shift, ctrl);
         }
 
@@ -168 +195 @@
          */
         private void paintRect() {
-                Graphics g = drawComponent.getGraphics();
+                Graphics g = mv.getGraphics();
                 g.setColor(Color.BLACK);
                 g.setXORMode(Color.WHITE);
@@ -196 +223 @@
                 if (aspectRatio) {
                         // keep the aspect ration by shrinking the rectangle
-                        double aspectRatio = (double)drawComponent.getWidth()/drawComponent.getHeight();
+                        double aspectRatio = (double)mv.getWidth()/mv.getHeight();
                         if ((double)w/h > aspectRatio) {
                                 int neww = (int)(h*aspectRatio);
@@ -212 +239 @@
                 return new Rectangle(x,y,w,h);
         }
+
+        /**
+         * If the action goes inactive, remove the selection rectangle from screen
+         */
+        public void propertyChange(PropertyChangeEvent evt) {
+                if (evt.getPropertyName() == "active" && !(Boolean)evt.getNewValue() && mousePosStart != null) {
+                        paintRect();
+                        mousePosStart = null;
+                        mousePos = null;
+                }
+        }
+
+        /**
+         * Return a list of all objects in the rectangle, respecting the different
+         * modifier.
+         * @param alt Whether the alt key was pressed, which means select all objects
+         *              that are touched, instead those which are completly covered. Also 
+         *              select whole tracks instead of line segments.
+         */
+        public Collection<OsmPrimitive> getObjectsInRectangle(Rectangle r, boolean alt) {
+                Collection<OsmPrimitive> selection = new LinkedList<OsmPrimitive>();
+
+                // whether user only clicked, not dragged.
+                boolean clicked = r.width <= 2 && r.height <= 2;
+                Point center = new Point(r.x+r.width/2, r.y+r.height/2);
+
+                if (clicked) {
+                        OsmPrimitive osm = mv.getNearest(center, alt);
+                        if (osm != null)
+                                selection.add(osm);
+                } else {
+                        // nodes
+                        for (Node n : mv.dataSet.nodes) {
+                                if (r.contains(mv.getScreenPoint(n.coor)))
+                                        selection.add(n);
+                        }
+                        
+                        // pending line segments
+                        for (LineSegment ls : mv.dataSet.pendingLineSegments)
+                                if (rectangleContainLineSegment(r, alt, ls))
+                                        selection.add(ls);
+
+                        // tracks
+                        for (Track t : mv.dataSet.tracks) {
+                                boolean wholeTrackSelected = t.segments.size() > 0;
+                                for (LineSegment ls : t.segments)
+                                        if (rectangleContainLineSegment(r, alt, ls))
+                                                selection.add(ls);
+                                        else
+                                                wholeTrackSelected = false;
+                                if (wholeTrackSelected)
+                                        selection.add(t);
+                        }
+                        
+                        // TODO areas
+                }
+                return selection;
+        }
+
+        /**
+         * Decide whether the line segment is in the rectangle Return 
+         * <code>true</code>, if it is in or false if not.
+         * 
+         * @param r                     The rectangle, in which the line segment has to be.
+         * @param alt           Whether user pressed the Alt key
+         * @param ls            The line segment.
+         * @return <code>true</code>, if the LineSegment was added to the selection.
+         */
+        private boolean rectangleContainLineSegment(Rectangle r, boolean alt, LineSegment ls) {
+                if (alt) {
+                        Point p1 = mv.getScreenPoint(ls.start.coor);
+                        Point p2 = mv.getScreenPoint(ls.end.coor);
+                        if (r.intersectsLine(p1.x, p1.y, p2.x, p2.y))
+                                return true;
+                } else {
+                        if (r.contains(mv.getScreenPoint(ls.start.coor))
+                                        && r.contains(mv.getScreenPoint(ls.end.coor)))
+                                return true;
+                }
+                return false;
+        }
         
+        
         /**
          * Does nothing. Only to satisfy MouseListener
@@ -229 +338 @@
          */
         public void mouseMoved(MouseEvent e) {}
+
 }