Changeset 27403 in osm for applications/editors/josm/plugins/piclayer

Timestamp:

2012-01-04T14:30:39+01:00 (13 years ago)

Author:

larry0ua

Message:

'PicLayer - now all actions are shown in history and user can undo/redo changes'

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/ResetCalibrationAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/MovePictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/RotatePictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScalePictureActionAbstract.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXPictureAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleXYPictureAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ScaleYPictureAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/ShearPictureAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/MovePointAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/TransformPointAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/transform/PictureTransform.java (modified) (6 diffs)

applications/editors/josm/plugins/piclayer/build.xml

@@ -22 +22 @@
 -->
 <project name="PicLayer" default="dist" basedir=".">
-    <property name="commit.message" value="PicLayer - fix of #7171"/>
+    <property name="commit.message" value="PicLayer - now all actions are shown in history and user can undo/redo changes"/>
     <property name="plugin.main.version" value="4669"/>
     <!--

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

@@ -13 +13 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.plugins.piclayer.command.TransformCommand;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -24 +25 @@
         protected EastNorth prevEastNorth = null;
         protected Point2D prevMousePoint = null;
+        protected TransformCommand currentCommand = null;
+        private String actionName;
 
-        public GenericPicTransformAction(String name, String iconName,
+        public GenericPicTransformAction(String name, String actionName, String iconName,
                         String tooltip, Shortcut shortcut, MapFrame mapFrame, Cursor cursor) {
                 super(name, iconName, tooltip, shortcut, mapFrame, cursor);
+                this.actionName = actionName;
         }
 
-        public GenericPicTransformAction(String name, String iconName,
+        public GenericPicTransformAction(String name, String actionName, String iconName,
                         String tooltip, MapFrame mapFrame, Cursor cursor) {
                 super(name, iconName, tooltip, mapFrame, cursor);
+        this.actionName = actionName;
         }
 
@@ -61 +66 @@
                     // try to find and fill selected point if possible
                     selectedPoint = currentLayer.findSelectedPoint(e.getPoint());
+                    currentCommand = new TransformCommand(currentLayer, actionName);
                 }
             }
@@ -82 +88 @@
             // End action
             isDragging = false;
+            currentCommand.addIfChanged();
         }
 

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

@@ -5 +5 @@
 import java.awt.event.ActionEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.piclayer.command.TransformCommand;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
 import org.openstreetmap.josm.plugins.piclayer.transform.PictureTransform;
@@ -18 +18 @@
                 this.layer = layer;
         }
-        
+
         @Override
         public void actionPerformed(ActionEvent arg0) {
+            TransformCommand currentCommand = new TransformCommand(layer, tr("Calibration reset"));
                 layer.resetCalibration();
-                Main.map.mapView.repaint();
+                currentCommand.addIfChanged();
         }
 }

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

@@ -26 +26 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -41 +41 @@
      */
     public MovePictureAction(MapFrame frame) {
-        super(tr("PicLayer move"), "move", tr("Drag to move the picture"), frame, ImageProvider.getCursor("crosshair", null));
+        super(tr("PicLayer move"), tr("Moved"), "move", tr("Drag to move the picture"), frame, ImageProvider.getCursor("crosshair", null));
     }
 

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

@@ -41 +41 @@
      */
     public RotatePictureAction(MapFrame frame) {
-        super(tr("PicLayer rotate"), "rotate", tr("Drag to rotate the picture"), frame, ImageProvider.getCursor("crosshair", null));
+        super(tr("PicLayer rotate"), tr("Rotated"), "rotate", tr("Drag to rotate the picture"), frame, ImageProvider.getCursor("crosshair", null));
     }
 
@@ -52 +52 @@
         else {
             factor = Main.pref.getDouble("piclayer.rotatefactors.low_precision", 10.0 );
-        }            
+        }
         currentLayer.rotatePictureBy( ( e.getY() - prevMousePoint.getY() ) / factor );
         }

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

@@ -38 +38 @@
      * Constructor
      */
-    public ScalePictureActionAbstract (String name, String icon, String tooltip, MapFrame frame) {
-        super(name, icon, tooltip, frame, ImageProvider.getCursor("crosshair", null));
+    public ScalePictureActionAbstract (String name, String actionName, String icon, String tooltip, MapFrame frame) {
+        super(name, actionName, icon, tooltip, frame, ImageProvider.getCursor("crosshair", null));
     }
 
+    @Override
     protected void doAction(MouseEvent e) {
         double factor;
@@ -49 +50 @@
         else {
             factor = Main.pref.getDouble("piclayer.scalefactors.low_precision", 1.015);
-        }            
+        }
         doTheScale( Math.pow(factor, prevMousePoint.getY() - e.getY() ) );
     }

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

@@ -35 +35 @@
      */
     public ScaleXPictureAction(MapFrame frame) {
-        super(tr("PicLayer scale 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);
     }
 
+    @Override
     public void doTheScale( double scale ) {
             currentLayer.scalePictureBy( scale, 1.0 );

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

@@ -35 +35 @@
      */
     public ScaleXYPictureAction(MapFrame frame) {
-        super(tr("PicLayer scale"), "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);
     }
 
+    @Override
     public void doTheScale( double scale ) {
             currentLayer.scalePictureBy( scale, scale );

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

@@ -35 +35 @@
      */
     public ScaleYPictureAction(MapFrame frame) {
-        super(tr("PicLayer scale 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);
     }
 
+    @Override
     public void doTheScale( double scale ) {
         currentLayer.scalePictureBy( 1.0, scale );

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

@@ -28 +28 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -43 +43 @@
      */
     public ShearPictureAction(MapFrame frame) {
-        super(tr("PicLayer shear"), "shear", tr("Drag to shear the picture"), frame, ImageProvider.getCursor("crosshair", null));
+        super(tr("PicLayer shear"), tr("Sheared"), "shear", tr("Drag to shear the picture"), frame, ImageProvider.getCursor("crosshair", null));
     }
 

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

@@ -7 +7 @@
 import java.awt.geom.Point2D;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
@@ -17 +16 @@
 
         public MovePointAction(MapFrame frame) {
-        super(tr("PicLayer Move point"), "movepoint", tr("Drag or create point on the picture"), frame, ImageProvider.getCursor("crosshair", null));
+        super(tr("PicLayer Move point"), tr("Point added/moved"), "movepoint", tr("Drag or create point on the picture"), frame, ImageProvider.getCursor("crosshair", null));
         }
 
@@ -42 +41 @@
                         if (selectedPoint == null)
                                 currentLayer.getTransformer().addOriginPoint(pressed);
+
+                        currentCommand.addIfChanged();
                 } catch (NoninvertibleTransformException e1) {
                         e1.printStackTrace();
                 }
-                Main.map.mapView.repaint();
         }
 

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

@@ -17 +17 @@
 
         public TransformPointAction(MapFrame frame) {
-                super(tr("PicLayer Transform point"), "transformpoint", tr("Transform point on the picture"), frame, ImageProvider.getCursor("crosshair", null));
+                super(tr("PicLayer Transform point"), tr("Point transformed"), "transformpoint", tr("Transform point on the picture"), frame, ImageProvider.getCursor("crosshair", null));
         }
 
@@ -30 +30 @@
                                 currentLayer.getTransformer().updatePair(selectedPoint, pressed);
                         }
+
+                        currentCommand.addIfChanged();
                 } catch (NoninvertibleTransformException e1) {
                         e1.printStackTrace();

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java

@@ -575 +575 @@
         return selected;
     }
+
+    public void saveTransformCommand() {
+
+    }
 }

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

@@ -12 +12 @@
 
         private List<Point2D> originPoints;
-        private List<Point2D> desiredPoints;
 
         public PictureTransform() {
                 cachedTransform = new AffineTransform();
                 originPoints = new ArrayList<Point2D>(3);
-                desiredPoints = new ArrayList<Point2D>(3);
         }
 
@@ -24 +22 @@
         }
 
-        public List<? extends Point2D> getOriginPoints() {
-                return originPoints;
-        }
-
-        public List<? extends Point2D> getDesiredPoints() {
-                return desiredPoints;
-        }
-
-        public void addDesiredPoint(Point2D picturePoint) {
-                if (desiredPoints.size() < 3)
-                        desiredPoints.add(picturePoint);
-                trySolve();
-        }
-
-        private AffineTransform solveEquation() throws NoSolutionException {
+        private AffineTransform solveEquation(List<Point2D> desiredPoints) throws NoSolutionException {
                 Matrix3D X = new Matrix3D(originPoints);
                 Matrix3D Y = new Matrix3D(desiredPoints);
@@ -49 +33 @@
                 if (originPoints.size() < 3)
                         originPoints.add(originPoint);
-                trySolve();
         }
 
         public void resetCalibration() {
                 originPoints.clear();
-                desiredPoints.clear();
                 modified = false;
                 cachedTransform = new AffineTransform();
-        }
-
-        private void trySolve() {
-                if (desiredPoints.size() == 3 && originPoints.size() == 3) {
-                        try {
-                                cachedTransform.concatenate(solveEquation());
-                                modified = true;
-                                desiredPoints.clear();
-                        } catch (NoSolutionException e) {
-                                System.err.println(e.getMessage());
-                        }
-                }
         }
 
@@ -86 +56 @@
                         return;
 
-                desiredPoints.clear();
+                List<Point2D> desiredPoints = new ArrayList<Point2D>(3);
 
                 for (Point2D origin : originPoints) {
@@ -94 +64 @@
                                 desiredPoints.add(origin);
                 }
-                trySolve();
+                trySolve(desiredPoints);
         }
+
+    private void trySolve(List<Point2D> desiredPoints) {
+        if (desiredPoints.size() == 3 && originPoints.size() == 3) {
+            try {
+                cachedTransform.concatenate(solveEquation(desiredPoints));
+                modified = true;
+                desiredPoints.clear();
+            } catch (NoSolutionException e) {
+                System.err.println(e.getMessage());
+            }
+        }
+    }
 
         public void replaceOriginPoint(Point2D originPoint, Point2D newOriginPoint) {
@@ -135 +117 @@
         modified = false;
     }
+
+    public void setTransform(AffineTransform newTransform) {
+        cachedTransform = new AffineTransform(newTransform);
+    }
+
+    public List<Point2D> getOriginPoints() {
+        return originPoints;
+    }
+
+    public void setOriginPoints(List<Point2D> list) {
+        this.originPoints = new ArrayList<Point2D>(list);
+    }
 }