Changeset 33148 in osm for applications/editors/josm/plugins

Timestamp:

2017-02-15T12:27:30+01:00 (8 years ago)

Author:

bastik

Message:

[piclayer] more natural mouse handling for scale: stick to mouse pointer

Location:

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/transform

Files:

• ScalePictureActionAbstract.java (deleted)
• ScaleXPictureAction.java (modified) (3 diffs)
• ScaleXYPictureAction.java (modified) (3 diffs)
• ScaleYPictureAction.java (modified) (3 diffs)

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

@@ -23 +23 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.event.MouseEvent;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -29 +34 @@
  */
 @SuppressWarnings("serial")
-public class ScaleXPictureAction extends ScalePictureActionAbstract {
+public class ScaleXPictureAction extends GenericPicTransformAction {
 
     /**
@@ -35 +40 @@
      */
     public ScaleXPictureAction(MapFrame frame) {
-        super(tr("PicLayer scale X"), tr("Scaled by X"), "scale_x", tr("Drag to scale the picture in the X Axis"), frame);
+        super(tr("PicLayer scale X"), tr("Scaled by X"), "scale_x", tr("Drag to scale the picture in the X Axis"), frame, ImageProvider.getCursor("crosshair", null));
     }
 
     @Override
-    public void doTheScale(double scale) {
-        currentLayer.scalePictureBy(scale, 1.0);
+    protected void doAction(MouseEvent e) {
+        double centerX = Main.map.mapView.getWidth()/2;
+        double dx0 = Math.max(Math.abs(prevMousePoint.getX() - centerX), 10);
+        double dx = Math.abs(e.getX() - centerX);
+        double scaleX = Math.max(dx / dx0, 0.9);
+        currentLayer.scalePictureBy(scaleX, 1.0);
     }
 }

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

@@ -23 +23 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Point;
+import java.awt.event.MouseEvent;
+import java.awt.geom.Point2D;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -29 +36 @@
  */
 @SuppressWarnings("serial")
-public class ScaleXYPictureAction extends ScalePictureActionAbstract {
+public class ScaleXYPictureAction extends GenericPicTransformAction {
 
     /**
@@ -35 +42 @@
      */
     public ScaleXYPictureAction(MapFrame frame) {
-        super(tr("PicLayer scale"), tr("Scaled"), "scale", tr("Drag to scale the picture in the X and Y Axis"), frame);
+        super(tr("PicLayer scale"), tr("Scaled"), "scale", tr("Drag to scale the picture in the X and Y Axis"), frame, ImageProvider.getCursor("crosshair", null));
     }
 
     @Override
-    public void doTheScale(double scale) {
+    protected void doAction(MouseEvent e) {
+        double centerX = Main.map.mapView.getWidth()/2;
+        double centerY = Main.map.mapView.getHeight()/2;
+        double d0 = Math.max(prevMousePoint.distance(centerX, centerY), 10);
+        Point2D mousePoint = new Point(e.getX(), e.getY());
+        double d = mousePoint.distance(centerX, centerY);
+        double scale = Math.max(d / d0, 0.9);
         currentLayer.scalePictureBy(scale, scale);
     }

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

@@ -23 +23 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.event.MouseEvent;
+
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -29 +34 @@
  */
 @SuppressWarnings("serial")
-public class ScaleYPictureAction extends ScalePictureActionAbstract {
+public class ScaleYPictureAction extends GenericPicTransformAction {
 
     /**
@@ -35 +40 @@
      */
     public ScaleYPictureAction(MapFrame frame) {
-        super(tr("PicLayer scale Y"), tr("Scaled by Y"), "scale_y", tr("Drag to scale the picture in the Y Axis"), frame);
+        super(tr("PicLayer scale Y"), tr("Scaled by Y"), "scale_y", tr("Drag to scale the picture in the Y Axis"), frame, ImageProvider.getCursor("crosshair", null));
     }
 
     @Override
-    public void doTheScale(double scale) {
-        currentLayer.scalePictureBy(1.0, scale);
+    protected void doAction(MouseEvent e) {
+        double centerY = Main.map.mapView.getHeight()/2;
+        double dy0 = Math.max(Math.abs(prevMousePoint.getY() - centerY), 10);
+        double dy = Math.abs(e.getY() - centerY);
+        double scaleY = Math.max(dy / dy0, 0.9);
+        currentLayer.scalePictureBy(1.0, scaleY);
     }
 }