Changeset 7 in josm for src/org/openstreetmap/josm/gui/SelectionManager.java

Timestamp:

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

Author:

imi

Message:

added mapmodes for adding and combining stuff. Reorganized images

File:

• src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (12 diffs)

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) {}
+
 }