Changeset 35001 in osm

Timestamp:

2019-05-17T19:22:51+02:00 (5 years ago)

Author:

rebeccas95

Message:

enhancement auto calibration for piclayer

Location:

applications/editors/josm/plugins/piclayer

Files:

• .classpath (modified) (1 diff)
• .project (modified) (2 diffs)
• .settings/org.eclipse.jdt.core.prefs (modified) (2 diffs)
• build.xml (modified) (1 diff)
• data/de.lang (modified) ( previous)
• data/gl.lang (modified) ( previous)
• data/it.lang (modified) ( previous)
• data/ja.lang (modified) ( previous)
• data/pl.lang (modified) ( previous)
• data/zh_TW.lang (modified) ( previous)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/MovePointAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/actions/transform/affine/RemovePointAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (modified) (10 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/transform/PictureTransform.java (modified) (4 diffs)

applications/editors/josm/plugins/piclayer/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+        <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
         <classpathentry kind="output" path="build"/>
 </classpath>

applications/editors/josm/plugins/piclayer/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>JOSM-piclayer</name>
+        <name>piclayer</name>
         <comment></comment>
         <projects>
+                <project>JOSM</project>
+                <project>JOSM-indoorhelper</project>
         </projects>
         <buildSpec>
@@ -11 +13 @@
                         </arguments>
                 </buildCommand>
-                <buildCommand>
-                        <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
-                        <arguments>
-                        </arguments>
-                </buildCommand>
-                <buildCommand>
-                        <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-                        <arguments>
-                        </arguments>
-                </buildCommand>
         </buildSpec>
         <natures>
                 <nature>org.eclipse.jdt.core.javanature</nature>
-                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
         </natures>
 </projectDescription>

applications/editors/josm/plugins/piclayer/.settings/org.eclipse.jdt.core.prefs

@@ -10 +10 @@
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
@@ -118 +123 @@
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <project name="PicLayer" default="dist" basedir=".">
+
     <property name="commit.message" value="[josm/PicLayer] - #12045 add ability to localize dialog titles"/>
+
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
-        
+
+    <property name="plugin.main.version" value="11713"/>
+
+
+
     <!-- Configure these properties (replace "..." accordingly).
+
          See https://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
+
     -->
-    <property name="plugin.author" value="Tomasz Stelmach"/>
+
+    <property name="plugin.author" value="Tomasz Stelmach, Rebecca Schmidt"/>
+
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.piclayer.PicLayerPlugin"/>
+
     <property name="plugin.description" value="This plugin allows to display any picture as a background in the editor and align it with the map."/>
+
     <property name="plugin.icon" value="images/layericon.png"/>
+
     <property name="plugin.link" value="https://josm.openstreetmap.de/wiki/Help/Plugin/PicLayer"/>
+
     <property name="plugin.canloadatruntime" value="true"/>
 
+
+
     <!-- ** include targets that all plugins have in common ** -->
+
     <import file="../build-common.xml"/>
 
+
+
 </project>

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;
 
@@ -84 +85 @@
             ScaleYPictureAction scaleYPictureAction = new ScaleYPictureAction();
             ShearPictureAction shearPictureAction = new ShearPictureAction();
+            AutoCalibratePictureAction autoCalibratePictureAction = new AutoCalibratePictureAction();
+
             // Create plugin buttons and add them to the toolbar
 
@@ -96 +99 @@
             buttonList.add(picLayerActionButtonFactory(scaleYPictureAction));
             buttonList.add(picLayerActionButtonFactory(shearPictureAction));
+            buttonList.add(picLayerActionButtonFactory(autoCalibratePictureAction));
 
             for (IconToggleButton btn : buttonList) {
@@ -120 +124 @@
 
         if (oldPic) {
-            ((PicLayerAbstract) oldLayer).setDrawPoints(false);
+            ((PicLayerAbstract) oldLayer).setDrawOriginPoints(false);
         }
 
         if (newPic) {
-            ((PicLayerAbstract) newLayer).setDrawPoints(true);
+            ((PicLayerAbstract) newLayer).setDrawOriginPoints(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).setDrawPoints(value);
+            ((PicLayerAbstract) active).setDrawOriginPoints(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;
+
 
 /**
@@ -41 +46 @@
 
         try {
+                setLatLonOriginPoints(e.getPoint());    // collect lat/lon data points for auto calibration
+
             Point2D pressed = currentLayer.transformPoint(e.getPoint());
             if (selectedPoint == null)
@@ -62 +69 @@
         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;
@@ -19 +21 @@
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 
@@ -58 +62 @@
     // Tiles of pin images
     private static Image pinTiledImage;
+    private static Image pinTiledImageOrange;
 
     // Initial position of the image in the real world
@@ -68 +73 @@
     protected double initialImageScale = 1.0;
 
-    // Layer icon
+    // Layer icon / lines
     private Icon layerIcon = null;
 
-    private boolean drawMarkers = true;
-
-    public void setDrawPoints(boolean value) {
-        drawMarkers = value;
+    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;
     }
 
@@ -126 +158 @@
             // 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();
         }
 
@@ -139 +172 @@
         // First, we initialize the calibration, so that createImage() can rely on it
 
-        transformer = new PictureTransform();
+          if(transformer == null)               transformer = new PictureTransform();
 
         // If the map does not exist - we're screwed. We should not get into this situation in the first place!
@@ -181 +214 @@
      */
     public abstract String getPicLayerName();
+
+    public Image getImage() {
+        return this.image;
+    }
 
     @Override
@@ -270 +307 @@
                 );
             }
-            if (drawMarkers) {
+            if (drawOriginMarkers) {
                 // draw markers for selection
                 Graphics2D gPoints = (Graphics2D) g2.create();
@@ -290 +327 @@
                            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 {
@@ -523 +599 @@
     }
 
-    public Point2D transformPoint(Point p) throws NoninvertibleTransformException {
+    public Point2D transformPoint(Point2D 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 {
@@ -29 +30 @@
         cachedTransform = new AffineTransform();
         originPoints = new ArrayList<>(3);
+        latLonOriginPoints = new ObservableArrayList<>(3);
     }
 
@@ -186 +188 @@
 
     public void setOriginPoints(List<Point2D> list) {
-        this.originPoints = new ArrayList<>(list);
+        if(originPoints == null)        originPoints = new ArrayList<>(list);
+        else {
+                originPoints.clear();
+                originPoints.addAll(list);
+        }
     }
 
@@ -192 +198 @@
         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();
+    }
 }