Changeset 19566 in josm

Timestamp:

2026-04-17T06:25:19+02:00 (3 hours ago)

Author:

GerdP

Message:

fix #24695: Unpredictable result when scaling or rotating an object again

• change code to handle repeated scale or rotation

(patch 24695.patch without the additional check reg. moved nodes outside download area)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (3 diffs)
• command/RotateCommand.java (modified) (3 diffs)
• command/ScaleCommand.java (modified) (2 diffs)

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

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.SelectionManager;
 import org.openstreetmap.josm.gui.SelectionManager.SelectionEnded;
@@ -793 +794 @@
                 if (mode == Mode.ROTATE) {
                     if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand) c).getTransformedNodes())) {
-                        ((RotateCommand) c).handleEvent(currentEN);
+                        if (didMouseDrag) {
+                            ((RotateCommand) c).handleEvent(currentEN);
+                        } else {
+                            ((RotateCommand) c).handleUpdate(currentEN);
+                        }
                     } else {
                         UndoRedoHandler.getInstance().add(new RotateCommand(selection, currentEN));
@@ -799 +804 @@
                 } else if (mode == Mode.SCALE) {
                     if (c instanceof ScaleCommand && affectedNodes.equals(((ScaleCommand) c).getTransformedNodes())) {
-                        ((ScaleCommand) c).handleEvent(currentEN);
+                        if (didMouseDrag) {
+                            ((ScaleCommand) c).handleEvent(currentEN);
+                        } else {
+                            ((ScaleCommand) c).handleUpdate(currentEN);
+                        }
                     } else {
                         UndoRedoHandler.getInstance().add(new ScaleCommand(selection, currentEN));

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

@@ -26 +26 @@
      * angle of rotation starting click to pivot
      */
-    private final double startAngle;
+    private double startAngle;
 
     /**
@@ -32 +32 @@
      */
     private double rotationAngle;
+
+    private double deltaAngle;
 
     /**
@@ -66 +68 @@
     public final void handleEvent(EastNorth currentEN) {
         double currentAngle = getAngle(currentEN);
-        rotationAngle = currentAngle - startAngle;
+        rotationAngle = currentAngle - startAngle + deltaAngle;
         transformNodes();
+    }
+
+    /**
+     * Handle a repeated rotation action where the mouse was moved to a different position
+     * see #24695
+     * @param startEN start cursor position of a repeated rotation
+     */
+    public void handleUpdate(EastNorth startEN) {
+        deltaAngle = rotationAngle;
+        startAngle = getAngle(startEN);
     }
 

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

@@ -27 +27 @@
 
     /**
+     * scaling factor applied previously
+     */
+    private double deltaScalingFactor;
+
+    /**
      * World position of the mouse when the user started the command.
      */
-    private final EastNorth startEN;
+    private EastNorth startEN;
 
     /**
@@ -58 +63 @@
     @Override
     public final void handleEvent(EastNorth currentEN) {
-        double startAngle = Math.atan2(startEN.east()-pivot.east(), startEN.north()-pivot.north());
-        double endAngle = Math.atan2(currentEN.east()-pivot.east(), currentEN.north()-pivot.north());
+        setScalingFactor(deltaScalingFactor + calcScalingFactor(currentEN));
+        transformNodes();
+    }
+
+    /**
+     * Handle a repeated scaling action where the mouse was moved to a different position
+     * see #24695
+     * @param newStartEN start cursor position of a repeated scaling
+     */
+    public void handleUpdate(EastNorth newStartEN) {
+        startEN = newStartEN;
+        deltaScalingFactor = scalingFactor - calcScalingFactor(newStartEN);
+    }
+
+    private double calcScalingFactor(EastNorth currentEN) {
+        double startAngle = Math.atan2(startEN.east() - pivot.east(), startEN.north() - pivot.north());
+        double endAngle = Math.atan2(currentEN.east() - pivot.east(), currentEN.north() - pivot.north());
         double startDistance = pivot.distance(startEN);
         double currentDistance = pivot.distance(currentEN);
-        setScalingFactor(Math.cos(startAngle-endAngle) * currentDistance / startDistance);
-        transformNodes();
+        return Math.cos(startAngle - endAngle) * currentDistance / startDistance;
     }