Changeset 33146 in osm for applications/editors

Timestamp:

2017-02-15T11:42:23+01:00 (8 years ago)

Author:

bastik

Message:

[piclayer] make rotation mouse handling more natural (stick to mouse pointer)

File:

• applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java (modified) (2 diffs)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java

@@ -23 +23 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.InputEvent;
+import java.awt.Point;
 import java.awt.event.MouseEvent;
+import java.awt.geom.Point2D;
 
 import org.openstreetmap.josm.Main;
@@ -47 +48 @@
     @Override
     protected void doAction(MouseEvent e) {
-        double factor;
-        if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) != 0) {
-            factor = Main.pref.getDouble("piclayer.rotatefactors.high_precision", 100.0);
-        } else {
-            factor = Main.pref.getDouble("piclayer.rotatefactors.low_precision", 10.0);
-        }
-        currentLayer.rotatePictureBy((e.getY() - prevMousePoint.getY()) / factor);
+        Point2D center = new Point(Main.map.mapView.getWidth()/2, Main.map.mapView.getHeight()/2);
+        double alpha1 = Math.atan2(e.getY() - center.getY(), e.getX() - center.getX());
+        double alpha0 = Math.atan2(prevMousePoint.getY() - center.getY(), prevMousePoint.getX() - center.getX());
+        currentLayer.rotatePictureBy(alpha1 - alpha0);
     }
 }