correcting position based on pan and zoom

Author: i-make-robots

src/main/java/com/marginallyclever/donatello/actions/undoable/AddNodeAction.java

@@ -36,7 +36,7 @@ public AddNodeAction(String name, Donatello editor) {
     public void actionPerformed(ActionEvent e) {
         Node n = AddNodePanel.runAsDialog((JFrame)SwingUtilities.getWindowAncestor(editor));
         if(n!=null) {
-            n.setPosition(editor.getPopupPoint());
+            n.setPosition(editor.getPaintArea().transformMousePoint(editor.getPopupPoint()));
             editor.addEdit(new AddNodeEdit((String)this.getValue(Action.NAME),editor,n));
         }
     }

src/main/java/com/marginallyclever/donatello/edits/PasteGraphEdit.java

@@ -18,7 +18,7 @@ public PasteGraphEdit(String name, Donatello editor, NodeGraph graph) {
         this.name = name;
         this.editor = editor;
         this.copiedGraph = graph.deepCopy();
-        this.m = editor.getMousePosition();
+        this.m = editor.getPaintArea().transformMousePoint(editor.getMousePosition());
         doIt();
     }
 

src/main/java/com/marginallyclever/donatello/modaltools/ConnectionEditTool.java

@@ -73,7 +73,7 @@ public void mouseClicked(MouseEvent e) {
     public void mouseMoved(MouseEvent e) {
         repaintConnectionInProgress(e.getPoint());
 
-        mousePreviousPosition.setLocation(e.getX(), e.getY());
+        mousePreviousPosition.setLocation(editor.getPaintArea().transformMousePoint(e.getPoint()));
         selectOneNearbyConnectionPoint(e.getPoint());
     }
 
@@ -82,7 +82,8 @@ public void mouseMoved(MouseEvent e) {
      * @param p the center of the search area.
      */
     private void selectOneNearbyConnectionPoint(Point p) {
-        NodeConnectionPointInfo info = editor.getGraph().getFirstNearbyConnection(p,NEARBY_CONNECTION_DISTANCE_MAX);
+        Point p2 = editor.getPaintArea().transformMousePoint(p);
+        NodeConnectionPointInfo info = editor.getGraph().getFirstNearbyConnection(p2,NEARBY_CONNECTION_DISTANCE_MAX);
         setLastConnectionPoint(info);
     }
 

src/main/java/com/marginallyclever/donatello/modaltools/NodeMoveTool.java

@@ -67,34 +67,36 @@ public void detachMouseAdapter() {
     @Override
     public void mouseDragged(MouseEvent e) {
         if(dragOn) {
-            int dx = e.getX() - mousePreviousPosition.x;
-            int dy = e.getY() - mousePreviousPosition.y;
+            Point p = editor.getPaintArea().transformMousePoint(e.getPoint());
+            int dx = p.x - mousePreviousPosition.x;
+            int dy = p.y - mousePreviousPosition.y;
             editor.moveSelectedNodes(dx, dy);
             editor.repaint();
         }
-        mousePreviousPosition.setLocation(e.getX(), e.getY());
+        mousePreviousPosition.setLocation(editor.getPaintArea().transformMousePoint(e.getPoint()));
     }
 
     @Override
     public void mouseMoved(MouseEvent e) {
-        mousePreviousPosition.setLocation(e.getX(), e.getY());
+        mousePreviousPosition.setLocation(editor.getPaintArea().transformMousePoint(e.getPoint()));
     }
 
     @Override
     public void mousePressed(MouseEvent e) {
         if(!dragOn) {
             dragOn=true;
-            mouseStartPosition.setLocation(e.getX(),e.getY());
-            mousePreviousPosition.setLocation(e.getX(), e.getY());
+            mousePreviousPosition.setLocation(editor.getPaintArea().transformMousePoint(e.getPoint()));
+            mouseStartPosition.setLocation(mousePreviousPosition);
         }
     }
 
     @Override
     public void mouseReleased(MouseEvent e) {
         if(dragOn) {
             dragOn=false;
-            int dx = e.getX() - mouseStartPosition.x;
-            int dy = e.getY() - mouseStartPosition.y;
+            Point p = editor.getPaintArea().transformMousePoint(e.getPoint());
+            int dx = p.x - mouseStartPosition.x;
+            int dy = p.y - mouseStartPosition.y;
             editor.addEdit(new MoveNodesEdit(getName(),editor,dx,dy));
         }
     }

src/main/java/com/marginallyclever/donatello/modaltools/RectangleSelectTool.java

@@ -107,7 +107,7 @@ private void paintSelectionArea(Graphics g) {
                 2, new float[]{3}, 0);
         g2d.setStroke(dashed);
 
-        g2d.setColor(keyStateMemory.isShiftKeyDown() ? Color.YELLOW : Color.MAGENTA);
+        g2d.setColor(keyStateMemory.isShiftKeyDown() ? Color.YELLOW : Color.GREEN);
         Rectangle2D r = getSelectionArea(mousePreviousPosition);
         g2d.drawRect((int)r.getMinX(),(int)r.getMinY(),(int)r.getWidth()-STROKE_WIDTH,(int)r.getHeight()-STROKE_WIDTH);
     }
@@ -141,7 +141,7 @@ public void mousePressed(MouseEvent e) {
 
     @Override
     public void mouseReleased(MouseEvent e) {
-        if(selectionOn) endSelectionArea(e.getPoint());
+        if(selectionOn) endSelectionArea(editor.getPaintArea().transformMousePoint(e.getPoint()));
     }
 
     /**