Ticket #3910: 3910_v2.patch

new file src/org/openstreetmap/josm/actions/LassoModeAction.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.MapMode;
+
+public class LassoModeAction extends MapMode {
+
+    public LassoModeAction() {
+        super(tr("Lasso Mode"),
+                "rope",
+                tr("Toggle Lasso Mode (in contrast to Rectangle Mode)"),
+                null,
+                null);
+    }
+
+    @Override
+    public void enterMode() {
+        super.enterMode();
+        if (Main.map != null) {
+            Main.map.mapModeSelect.setLassoMode(true);
+            Main.map.mapModeSelect.enterMode();
+        }
+    }
+
+    @Override
+    public void exitMode() {
+        super.exitMode();
+        Main.map.mapModeSelect.setLassoMode(false);
+        Main.map.mapModeSelect.exitMode();
+    }
+}

src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -83 +83 @@
         scale("scale", null),
         rotate("rotate", null),
         merge("crosshair", null),
+        lasso("normal", "rope"),
         merge_to_node("crosshair", "joinnode"),
         move(Cursor.MOVE_CURSOR);
 
@@ -98 +99 @@
         }
     }
 
+    private boolean lassoMode = false;
+
     // Cache previous mouse event (needed when only the modifier keys are
     // pressed but the mouse isn't moved)
     private MouseEvent oldEvent = null;
@@ -171 +174 @@
         super.enterMode();
         mv.addMouseListener(this);
         mv.addMouseMotionListener(this);
-        mv.setVirtualNodesEnabled(
-                Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
+        mv.setVirtualNodesEnabled(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
         drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
         // This is required to update the cursors when ctrl/shift/alt is pressed
         try {
@@ -240 +242 @@
             c = "scale";
             break;
         case select:
-            c = "rect" + (shift ? "_add" : (ctrl ? "_rm" : ""));
+            if (lassoMode) {
+                c = "lasso";
+            } else {
+                c = "rect" + (shift ? "_add" : (ctrl ? "_rm" : ""));
+            }
             break;
         }
         return SelectActionCursor.valueOf(c).cursor();
@@ -726 +732 @@
             break;
         case select:
         default:
-            selectionManager.register(mv);
+            selectionManager.register(mv, lassoMode);
             selectionManager.mousePressed(e);
             break;
         }
@@ -824 +830 @@
 
     public void selectionEnded(Rectangle r, MouseEvent e) {
         updateKeyModifiers(e);
-        selectPrims(selectionManager.getObjectsInRectangle(r, alt), e, true, true);
+        mv.repaint();
+        selectPrims(selectionManager.getSelectedObjects(alt), e, true, true);
     }
 
     /**
@@ -973 +980 @@
     public boolean layerIsSupported(Layer l) {
         return l instanceof OsmDataLayer;
     }
+
+    public void setLassoMode(boolean lassoMode) {
+        System.out.println(lassoMode);
+        this.selectionManager.setLassoMode(lassoMode);
+        this.lassoMode = lassoMode;
+    }
 }

src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java

@@ -59 +59 @@
 
     @Override public void enterMode() {
         super.enterMode();
-        selectionManager.register(Main.map.mapView);
+        selectionManager.register(Main.map.mapView, false);
     }
 
     @Override public void exitMode() {

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

@@ -40 +40 @@
 import javax.swing.plaf.basic.BasicSplitPaneUI;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.LassoModeAction;
 import org.openstreetmap.josm.actions.mapmode.DeleteAction;
 import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.mapmode.ExtrudeAction;
@@ -108 +109 @@
     public PropertiesDialog propertiesDialog;
 
     // Map modes
-    private final MapMode mapModeSelect;
+    public final SelectAction mapModeSelect;
     private final MapMode mapModeDraw;
     private final MapMode mapModeZoom;
 
@@ -158 +159 @@
         // toolbar
         toolBarActions.setFloatable(false);
         addMapMode(new IconToggleButton(mapModeSelect = new SelectAction(this)));
+        addMapMode(new IconToggleButton(new LassoModeAction(), true));
         addMapMode(new IconToggleButton(mapModeDraw = new DrawAction(this)));
         addMapMode(new IconToggleButton(mapModeZoom = new ZoomAction(this)));
         addMapMode(new IconToggleButton(new DeleteAction(this), true));

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

@@ -5 +5 @@
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Point;
+import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
@@ -96 +97 @@
      */
     private boolean aspectRatio;
 
+    private boolean lassoMode;
+    private Polygon lasso = new Polygon();
+
     /**
      * Create a new SelectionManager.
      *
@@ -115 +119 @@
      * Register itself at the given event source.
      * @param eventSource The emitter of the mouse events.
      */
-    public void register(NavigatableComponent eventSource) {
+    public void register(NavigatableComponent eventSource, boolean lassoMode) {
+       this.lassoMode = lassoMode;
         eventSource.addMouseListener(this);
         eventSource.addMouseMotionListener(this);
         selectionEndedListener.addPropertyChangeListener(this);
@@ -146 +151 @@
     public void mousePressed(MouseEvent e) {
         if (e.getButton() == MouseEvent.BUTTON1) {
             mousePosStart = mousePos = e.getPoint();
+
+            lasso.reset();
+            lasso.addPoint(mousePosStart.x, mousePosStart.y);
         }
     }
 
@@ -159 +167 @@
             if (mousePosStart == null) {
                 mousePosStart = mousePos = e.getPoint();
             }
-            paintRect();
+            if (!lassoMode) {
+                paintRect();
+            }
         }
 
         if (buttonPressed == MouseEvent.BUTTON1_DOWN_MASK) {
             mousePos = e.getPoint();
-            paintRect();
+            if (lassoMode) {
+                paintLasso();
+            } else {
+                paintRect();
+            }
         } else if (buttonPressed == (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK)) {
             mousePosStart.x += e.getX()-mousePos.x;
             mousePosStart.y += e.getY()-mousePos.y;
@@ -181 +195 @@
             return;
         if (mousePos == null || mousePosStart == null)
             return; // injected release from outside
-
         // disable the selection rect
-        paintRect();
-        Rectangle r = getSelectionRectangle();
+        Rectangle r;
+        if (!lassoMode) {
+            paintRect();
+            r = getSelectionRectangle();
+
+            lasso = rectToPolygon(r);
+        } else {
+            lasso.addPoint(mousePos.x, mousePos.y);
+            r = lasso.getBounds();
+        }
         mousePosStart = null;
         mousePos = null;
 
@@ -208 +229 @@
         g.drawRect(r.x,r.y,r.width,r.height);
     }
 
+    private void paintLasso() {
+        if (mousePos == null || mousePosStart == null || mousePos == mousePosStart) {
+            return;
+        }
+
+        Graphics g = nc.getGraphics();
+        g.setColor(Color.WHITE);
+
+        int lastPosX = lasso.xpoints[lasso.npoints - 1];
+        int lastPosY = lasso.ypoints[lasso.npoints - 1];
+        g.drawLine(lastPosX, lastPosY, mousePos.x, mousePos.y);
+
+        lasso.addPoint(mousePos.x, mousePos.y);
+    }
+
     /**
      * Calculate and return the current selection rectangle
      * @return A rectangle that spans from mousePos to mouseStartPos
@@ -260 +296 @@
     }
 
     /**
-     * Return a list of all objects in the rectangle, respecting the different
+     * Return a list of all objects in the selection, 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.
+     *
+     * @param alt Whether the alt key was pressed, which means select all
+     * objects that are touched, instead those which are completely covered.
      */
-    public Collection<OsmPrimitive> getObjectsInRectangle(Rectangle r, boolean alt) {
+    public Collection<OsmPrimitive> getSelectedObjects(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);
+        boolean clicked = false;
+        Rectangle bounding = lasso.getBounds();
+        if (bounding.height <= 2 && bounding.width <= 2) {
+            clicked = true;
+        }
 
         if (clicked) {
+            Point center = new Point(lasso.xpoints[0], lasso.ypoints[0]);
             OsmPrimitive osm = nc.getNearestNodeOrWay(center, OsmPrimitive.isSelectablePredicate, false);
             if (osm != null) {
                 selection.add(osm);
@@ -280 +322 @@
         } else {
             // nodes
             for (Node n : nc.getCurrentDataSet().getNodes()) {
-                if (n.isSelectable() && r.contains(nc.getPoint(n))) {
+                if (n.isSelectable() && lasso.contains(nc.getPoint(n))) {
                     selection.add(n);
                 }
             }
@@ -292 +334 @@
                 }
                 if (alt) {
                     for (Node n : w.getNodes()) {
-                        if (!n.isIncomplete() && r.contains(nc.getPoint(n))) {
+                        if (!n.isIncomplete() && lasso.contains(nc.getPoint(n))) {
                             selection.add(w);
                             break;
                         }
@@ -300 +342 @@
                 } else {
                     boolean allIn = true;
                     for (Node n : w.getNodes()) {
-                        if (!n.isIncomplete() && !r.contains(nc.getPoint(n))) {
+                        if (!n.isIncomplete() && !lasso.contains(nc.getPoint(n))) {
                             allIn = false;
                             break;
                         }
@@ -314 +356 @@
         return selection;
     }
 
+    private Polygon rectToPolygon(Rectangle r) {
+        Polygon poly = new Polygon();
+
+        poly.addPoint(r.x, r.y);
+        poly.addPoint(r.x, r.y + r.height);
+        poly.addPoint(r.x + r.width, r.y + r.height);
+        poly.addPoint(r.x + r.width, r.y);
+
+        return poly;
+    }
+
+    public void setLassoMode(boolean lassoMode) {
+        this.lassoMode = lassoMode;
+    }
+
     public void mouseClicked(MouseEvent e) {}
     public void mouseEntered(MouseEvent e) {}
     public void mouseExited(MouseEvent e) {}