Changeset 35003 in osm for applications/editors/josm/plugins/piclayer/src/org

Timestamp:

2019-05-18T02:05:52+02:00 (6 years ago)

Author:

donvip

Message:

fix #josm17728 - revert last commit

Location:

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

Files:

• PicLayerPlugin.java (modified) (4 diffs)
• actions/GenericPicTransformAction.java (modified) (1 diff)
• actions/transform/affine/MovePointAction.java (modified) (3 diffs)
• actions/transform/affine/RemovePointAction.java (modified) (1 diff)
• layer/PicLayerAbstract.java (modified) (10 diffs)
• transform/PictureTransform.java (modified) (4 diffs)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

@@ -36 +36 @@
 import org.openstreetmap.josm.plugins.piclayer.actions.transform.affine.RemovePointAction;
 import org.openstreetmap.josm.plugins.piclayer.actions.transform.affine.TransformPointAction;
-import org.openstreetmap.josm.plugins.piclayer.actions.transform.autocalibrate.AutoCalibratePictureAction;
 import org.openstreetmap.josm.plugins.piclayer.layer.PicLayerAbstract;
 
@@ -85 +84 @@
             ScaleYPictureAction scaleYPictureAction = new ScaleYPictureAction();
             ShearPictureAction shearPictureAction = new ShearPictureAction();
-            AutoCalibratePictureAction autoCalibratePictureAction = new AutoCalibratePictureAction();
-
             // Create plugin buttons and add them to the toolbar
 
@@ -99 +96 @@
             buttonList.add(picLayerActionButtonFactory(scaleYPictureAction));
             buttonList.add(picLayerActionButtonFactory(shearPictureAction));
-            buttonList.add(picLayerActionButtonFactory(autoCalibratePictureAction));
 
             for (IconToggleButton btn : buttonList) {
@@ -124 +120 @@
 
         if (oldPic) {
-            ((PicLayerAbstract) oldLayer).setDrawOriginPoints(false);
+            ((PicLayerAbstract) oldLayer).setDrawPoints(false);
         }
 
         if (newPic) {
-            ((PicLayerAbstract) newLayer).setDrawOriginPoints(true);
+            ((PicLayerAbstract) newLayer).setDrawPoints(true);
         }
     }

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

@@ -103 +103 @@
         Layer active = MainApplication.getLayerManager().getActiveLayer();
         if (active instanceof PicLayerAbstract) {
-            ((PicLayerAbstract) active).setDrawOriginPoints(value);
+            ((PicLayerAbstract) active).setDrawPoints(value);
             active.invalidate();
         }

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

@@ -8 +8 @@
 import java.awt.geom.Point2D;
 
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
-import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
-import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.piclayer.actions.GenericPicTransformAction;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
-
 
 /**
@@ -46 +41 @@
 
         try {
-                setLatLonOriginPoints(e.getPoint());    // collect lat/lon data points for auto calibration
-
             Point2D pressed = currentLayer.transformPoint(e.getPoint());
             if (selectedPoint == null)
@@ -69 +62 @@
         updateDrawPoints(false);
     }
-
-    /**
-     * Method to collect raw data points for additional auto calibration and transforms them into LatLon.
-     * Transformed points will be stored into {@code PictureTransform } attribute to make them accessible for actions.
-     * @param point to collect
-     */
-    private void setLatLonOriginPoints(Point2D point) {
-        LatLon latLonPoint = MainApplication.getMap().mapView.getLatLon(point.getX(), point.getY());
-        ICoordinateFormat mCoord = CoordinateFormatManager.getDefaultFormat();
-        double latY = Double.parseDouble(mCoord.latToString(latLonPoint));
-        double lonX = Double.parseDouble(mCoord.lonToString(latLonPoint));
-        currentLayer.getTransformer().addLatLonOriginPoint(new Point2D.Double(lonX, latY));
-    }
-
 }

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

@@ -25 +25 @@
 
         if (selectedPoint != null) {
-                currentLayer.getTransformer().removeLatLonOriginPoint(selectedPoint);
             currentLayer.getTransformer().removeOriginPoint(selectedPoint);
             selectedPoint = null;

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
@@ -21 +19 @@
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
@@ -62 +58 @@
     // Tiles of pin images
     private static Image pinTiledImage;
-    private static Image pinTiledImageOrange;
 
     // Initial position of the image in the real world
@@ -73 +68 @@
     protected double initialImageScale = 1.0;
 
-    // Layer icon / lines
+    // Layer icon
     private Icon layerIcon = null;
 
-    private boolean drawOriginMarkers = true;
-
-    private boolean drawRefMarkers = false;
-
-    private boolean drawFirstLine = false;
-
-    private boolean drawSecLine = false;
-
-    public void setDrawOriginPoints(boolean value) {
-        drawOriginMarkers = value;
-    }
-
-    private List<Point2D> refPointsBuffer = new ArrayList<>(3); // only for buffering
-
-    public void setDrawReferencePoints(boolean value, Point2D pointToDraw) {
-        drawRefMarkers = value;
-        if(this.refPointsBuffer == null)        refPointsBuffer = new ArrayList<>(3);
-        if(pointToDraw != null)                         this.refPointsBuffer.add(pointToDraw);
-    }
-
-    public void clearDrawReferencePoints() {
-        drawRefMarkers = false;
-        this.refPointsBuffer = null;
-    }
-
-    public void setDrawFirstLine(boolean value) {
-        drawFirstLine = value;
-    }
-
-    public void setDrawSecLine(boolean value) {
-        drawSecLine = value;
+    private boolean drawMarkers = true;
+
+    public void setDrawPoints(boolean value) {
+        drawMarkers = value;
     }
 
@@ -158 +126 @@
             // allow system to load the image and use it in future
             pinTiledImage = new ImageIcon(Toolkit.getDefaultToolkit().createImage(getClass().getResource("/images/v6_64.png"))).getImage();
-            pinTiledImageOrange = new ImageIcon(Toolkit.getDefaultToolkit().createImage(getClass().getResource("/images/v6_64o.png"))).getImage();
         }
 
@@ -172 +139 @@
         // First, we initialize the calibration, so that createImage() can rely on it
 
-          if(transformer == null)               transformer = new PictureTransform();
+        transformer = new PictureTransform();
 
         // If the map does not exist - we're screwed. We should not get into this situation in the first place!
@@ -214 +181 @@
      */
     public abstract String getPicLayerName();
-
-    public Image getImage() {
-        return this.image;
-    }
 
     @Override
@@ -307 +270 @@
                 );
             }
-            if (drawOriginMarkers) {
+            if (drawMarkers) {
                 // draw markers for selection
                 Graphics2D gPoints = (Graphics2D) g2.create();
@@ -327 +290 @@
                            pinTileOffsetX[i], pinTileOffsetY[i], pinTileOffsetX[i]+pinWidth, pinTileOffsetY[i]+pinHeight, null);
                 }
-            }
-            if (drawRefMarkers) {
-                // draw markers for selection
-                Graphics2D gPoints = (Graphics2D) g2.create();
-
-                gPoints.translate(pic_offset_x, pic_offset_y);
-
-                gPoints.setColor(Color.RED); // red color for points output
-
-                AffineTransform tr = AffineTransform.getScaleInstance(scalex, scaley);
-                tr.concatenate(transformer.getTransform());
-
-                for (int i = 0; i < refPointsBuffer.size(); i++) {
-                   Point2D trP = tr.transform(refPointsBuffer.get(i), null);
-                   int x = (int) trP.getX(), y = (int) trP.getY();
-
-                   int dstx = x-pinAnchorX;
-                   int dsty = y-pinAnchorY;
-                   gPoints.drawImage(pinTiledImageOrange, dstx, dsty, dstx+pinWidth, dsty+pinHeight,
-                           pinTileOffsetX[i], pinTileOffsetY[i], pinTileOffsetX[i]+pinWidth, pinTileOffsetY[i]+pinHeight, null);
-                }
-            }
-            if (drawFirstLine) {
-                // set line from point1 to point2
-                List<Point2D> points = this.getTransformer().getOriginPoints();
-                Point2D p1 = points.get(0);
-                Point2D p2 = points.get(1);
-                g.setColor(Color.green);
-                g.setStroke(new BasicStroke(5));
-                g.drawLine((int)p1.getX(), (int)p1.getY(), (int)p2.getX(), (int)p2.getY());
-            }
-            if (drawSecLine) {
-                // set line from point2 to point3
-                List<Point2D> points = this.getTransformer().getOriginPoints();
-                Point2D p2 = points.get(1);
-                Point2D p3 = points.get(2);
-                g.setColor(Color.green);
-                g.setStroke(new BasicStroke(5));
-                g.drawLine((int)p2.getX(), (int)p2.getY(), (int)p3.getX(), (int)p3.getY());
             }
         } else {
@@ -599 +523 @@
     }
 
-    public Point2D transformPoint(Point2D p) throws NoninvertibleTransformException {
+    public Point2D transformPoint(Point p) throws NoninvertibleTransformException {
         // Position image at the right graphical place
 

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.plugins.piclayer.actions.transform.autocalibrate.helper.ObservableArrayList;
 
 public class PictureTransform {
@@ -30 +29 @@
         cachedTransform = new AffineTransform();
         originPoints = new ArrayList<>(3);
-        latLonOriginPoints = new ObservableArrayList<>(3);
     }
 
@@ -188 +186 @@
 
     public void setOriginPoints(List<Point2D> list) {
-        if(originPoints == null)        originPoints = new ArrayList<>(list);
-        else {
-                originPoints.clear();
-                originPoints.addAll(list);
-        }
+        this.originPoints = new ArrayList<>(list);
     }
 
@@ -198 +192 @@
         originPoints.remove(selectedPoint);
     }
-
-    public void clearOriginPoints() {
-        originPoints.clear();
-    }
-
-    // similar to originPointList - points scaled in LatLon, list observable
-    private ObservableArrayList<Point2D> latLonOriginPoints = new ObservableArrayList<>(3);
-
-    public ObservableArrayList<Point2D> getLatLonOriginPoints() {
-        return this.latLonOriginPoints;
-    }
-
-    public void addLatLonOriginPoint(Point2D p) {
-        latLonOriginPoints.add(p);
-    }
-
-    public void removeLatLonOriginPoint(Point2D selectedPoint) {
-        int index = originPoints.indexOf(selectedPoint);
-        Point2D toDelete = this.latLonOriginPoints.get(index);
-        this.latLonOriginPoints.remove(toDelete);
-    }
-
-    public void setLatLonOriginPoint(List<Point2D> list) {
-        if(latLonOriginPoints == null)  latLonOriginPoints = new ObservableArrayList<>(list);
-        else {
-                latLonOriginPoints.clear();
-                latLonOriginPoints.addAll(list);
-        }
-    }
-
-    public void clearLatLonOriginPoints() {
-        latLonOriginPoints.clear();
-    }
 }