Changeset 5418 in josm

Timestamp:

Aug 10, 2012 9:01:12 PM (9 months ago)

Author:

akks

Message:

fix #7082 (?) - CTRL-drag in selection mode problem, see #7888: SelectAction and MoveCommand rework

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (14 diffs)
• command/MoveCommand.java (modified) (8 diffs)

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

@@ -120 +120 @@
     private Point startingDraggingPos;
     /**
+     * point where user pressed the mouse to start movement
+     */
+    EastNorth startEN;
+    /**
      * The last known position of the mouse.
      */
@@ -198 +202 @@
     }
 
+    int previousModifiers;
+    
      /**
      * This is called whenever the keyboard modifier status changes
@@ -206 +212 @@
         // We don't have a mouse event, so we pass the old mouse event but the
         // new modifiers.
+        int modif = ((InputEvent) e).getModifiers();
+        if (previousModifiers == modif)
+            return;
+        previousModifiers = modif;
         if(giveUserFeedback(oldEvent, ((InputEvent) e).getModifiers())) {
             mv.repaint();
@@ -397 +407 @@
         mouseDownTime = System.currentTimeMillis();
         lastMousePos = e.getPoint();
+        startEN = mv.getEastNorth(lastMousePos.x,lastMousePos.y);
 
         // primitives under cursor are stored in c collection
@@ -424 +435 @@
             }
             selectPrims(cycleManager.cycleSetup(nearestPrimitive, e.getPoint()), false, false);
+            useLastMoveCommandIfPossible();
             break;
         case select:
@@ -509 +521 @@
 
         if (!initialMoveThresholdExceeded) {
-            int dxp = lastMousePos.x - e.getX();
-            int dyp = lastMousePos.y - e.getY();
-            int dp = (int) Math.sqrt(dxp * dxp + dyp * dyp);
+            int dp = (int) lastMousePos.distance(e.getX(), e.getY());
             if (dp < initialMoveThreshold)
                 return;
@@ -518 +528 @@
 
         EastNorth currentEN = mv.getEastNorth(e.getX(), e.getY());
-        EastNorth lastEN = mv.getEastNorth(lastMousePos.x, lastMousePos.y);
-        //EastNorth startEN = mv.getEastNorth(startingDraggingPos.x, startingDraggingPos.y);
-        double dx = currentEN.east() - lastEN.east();
-        double dy = currentEN.north() - lastEN.north();
-        if (dx == 0 && dy == 0)
-            return;
-
+        if (e.getPoint().equals(lastMousePos))
+            return;
+        
         if (virtualManager.hasVirtualWays()) {
-            virtualManager.processVirtualNodeMovements(dx, dy);
+            virtualManager.processVirtualNodeMovements(currentEN);
         } else {
-            if (!updateCommandWhileDragging(dx, dy, currentEN)) return;
+            if (!updateCommandWhileDragging(currentEN)) return;
         }
 
@@ -561 +567 @@
 
             // Select Draw Tool if no selection has been made
-            if (getCurrentDataSet().getSelected().size() == 0 && !cancelDrawMode) {
+            if (getCurrentDataSet().getSelected().isEmpty() && !cancelDrawMode) {
                 Main.map.selectDrawTool(true);
                 return;
@@ -646 +652 @@
      * Create or update data modfication command whle dragging mouse - implementation of 
      * continuous moving, scaling and rotation
-     * @param dx, @param dy - mouse displacement
-     * @param currentEN -
+     * @param currentEN - mouse position
      * @return 
      */
-    private boolean updateCommandWhileDragging(double dx, double dy, EastNorth currentEN) {
+    private boolean updateCommandWhileDragging(EastNorth currentEN) {
         // Currently we support only transformations which do not affect relations.
         // So don't add them in the first place to make handling easier
@@ -659 +664 @@
             return false;
         }
-        Command c = !Main.main.undoRedo.commands.isEmpty()
-                ? Main.main.undoRedo.commands.getLast() : null;
-        if (c instanceof SequenceCommand) {
-            c = ((SequenceCommand) c).getLastCommand();
-        }
+        Command c = getLastCommand();
         if (mode == Mode.move) {
             getCurrentDataSet().beginUpdate();
             if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
-                ((MoveCommand) c).moveAgain(dx, dy);
+                ((MoveCommand) c).saveCheckpoint();
+                ((MoveCommand) c).applyVectorTo(currentEN);
             } else {
                 Main.main.undoRedo.add(
-                        c = new MoveCommand(selection, dx, dy));
-            }
-            getCurrentDataSet().endUpdate();
+                        c = new MoveCommand(selection, startEN, currentEN));
+            }
             for (Node n : affectedNodes) {
                 if (n.getCoor().isOutSideWorld()) {
                     // Revert move
-                    ((MoveCommand) c).moveAgain(-dx, -dy);
+                    ((MoveCommand) c).resetToCheckpoint();
                     JOptionPane.showMessageDialog(
                             Main.parent,
@@ -686 +687 @@
                 }
             }
+            getCurrentDataSet().endUpdate();
         } else if (mode == Mode.rotate) {
             getCurrentDataSet().beginUpdate();
@@ -704 +706 @@
         }
         return true;
+    }
+    
+    /**
+     * Adapt last move command (if it is suitabble) to work with next drag, startedd at point startEN
+     */
+    private void useLastMoveCommandIfPossible() {
+        Command c = getLastCommand();
+        Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(getCurrentDataSet().getSelected());
+        if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand) c).getParticipatingPrimitives())) {
+            // old command was created with different base point of movement, we need to recalculate it
+            ((MoveCommand) c).changeStartPoint(startEN);
+        }
+    }
+       
+    /**
+     * Obtain command in undoRedo stack to "continue" when dragging
+     */
+    private Command getLastCommand() {
+        Command c = !Main.main.undoRedo.commands.isEmpty()
+                ? Main.main.undoRedo.commands.getLast() : null;
+        if (c instanceof SequenceCommand) {
+            c = ((SequenceCommand) c).getLastCommand();
+        }
+        return c;
     }
     
@@ -1036 +1062 @@
         }
 
-        private void processVirtualNodeMovements(double dx, double dy) {
+        private void processVirtualNodeMovements(EastNorth currentEN) {
             Collection<Command> virtualCmds = new LinkedList<Command>();
             virtualCmds.add(new AddCommand(virtualNode));
@@ -1045 +1071 @@
                 virtualCmds.add(new ChangeCommand(w, wnew));
             }
-            virtualCmds.add(new MoveCommand(virtualNode, dx, dy));
+            virtualCmds.add(new MoveCommand(virtualNode, startEN, currentEN));
             String text = trn("Add and move a virtual new node to way",
                     "Add and move a virtual new node to {0} ways", virtualWays.size(),

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -33 +33 @@
     private Collection<Node> nodes = new LinkedList<Node>();
     /**
+     * Starting position, base command point, current (mouse-drag) position = startEN + (x,y) = 
+     */
+    private EastNorth startEN;
+
+    /**
      * x difference movement. Coordinates are in northern/eastern
      */
@@ -40 +45 @@
      */
     private double y;
+
+    private double backupX;
+    private double backupY;
 
     /**
@@ -47 +55 @@
     public static class OldState {
         LatLon latlon;
+        EastNorth en; // cached EastNorth to be used for applying exact displacenment
         boolean modified;
     }
@@ -66 +75 @@
         this(objects, offset.getX(), offset.getY());
     }
-
+    
     /**
      * Create a MoveCommand and assign the initial object set and movement vector.
@@ -72 +81 @@
     public MoveCommand(Collection<OsmPrimitive> objects, double x, double y) {
         super();
+        startEN = null;
+        saveCheckpoint(); // (0,0) displacement will be saved
         this.x = x;
         this.y = y;
@@ -78 +89 @@
             OldState os = new OldState();
             os.latlon = new LatLon(n.getCoor());
+            os.en = n.getEastNorth();
             os.modified = n.isModified();
             oldState.add(os);
@@ -83 +95 @@
     }
 
+     public MoveCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
+         this(objects, end.getX()-start.getX(), end.getY()-start.getY());
+         startEN =  start;
+     }
+
+     public MoveCommand(OsmPrimitive p, EastNorth start, EastNorth end) {
+         this(Collections.singleton(p), end.getX()-start.getX(), end.getY()-start.getY());
+         startEN =  start;
+     }
+     
     /**
      * Move the same set of objects again by the specified vector. The vectors
@@ -102 +124 @@
         moveAgain(x - this.x, y - this.y);
     }
+    
+    /**
+     * Change the displacement vector to have endpoint @param currentEN 
+     * starting point is  startEN
+     */
+    public void applyVectorTo(EastNorth currentEN) {
+        if (startEN == null) 
+            return;
+        x = currentEN.getX() - startEN.getX();
+        y = currentEN.getY() - startEN.getY();
+        updateCoordinates();
+    }
+
+     /**
+     * Changes base point of movement
+     * @param newDraggedStartPoint - new starting point after movement (where user clicks to start new drag)
+     */
+    public void changeStartPoint(EastNorth newDraggedStartPoint) {
+        startEN = new EastNorth(newDraggedStartPoint.getX()-x, newDraggedStartPoint.getY()-y);
+     }
+
+    /**
+     * Save curent displacement to restore in case of some problems
+     */
+    public void saveCheckpoint() {
+        backupX = x;
+        backupY = y;
+    }
+
+    /**
+     * Restore old displacement in case of some problems
+     */
+    public void resetToCheckpoint() {
+        x = backupX;
+        y = backupY;
+        updateCoordinates();
+    }
+
+    private void updateCoordinates() {
+        Iterator<OldState> it = oldState.iterator();
+        for (Node n : nodes) {
+            OldState os = it.next();
+            n.setEastNorth(os.en.add(x, y));
+        }
+    }
 
     @Override public boolean executeCommand() {