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

Timestamp:

2012-08-16T11:45:11+02:00 (12 years ago)

Author:

larry0ua

Message:

'PicLayer - #7127 - added world file loading option'

Location:

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

Files:

• PicLayerAbstract.java (modified) (7 diffs)
• PicLayerFromKML.java (modified) (2 diffs)

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

@@ -48 +48 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.piclayer.actions.LoadPictureCalibrationAction;
+import org.openstreetmap.josm.plugins.piclayer.actions.LoadPictureCalibrationFromWorldAction;
 import org.openstreetmap.josm.plugins.piclayer.actions.ResetCalibrationAction;
 import org.openstreetmap.josm.plugins.piclayer.actions.SavePictureCalibrationAction;
@@ -121 +123 @@
     private static final int pinHeight = 64;
 
+    protected final Projection projection;
+
     /**
      * Constructor
@@ -137 +141 @@
             pinTiledImage = new ImageIcon(Toolkit.getDefaultToolkit().createImage(getClass().getResource("/images/v6_64.png"))).getImage();
         }
+
+        projection = Main.getProjection();
     }
 
@@ -201 +207 @@
                 new SavePictureCalibrationAction(this),
                 new LoadPictureCalibrationAction(this),
+                new LoadPictureCalibrationFromWorldAction(this),
                 SeparatorLayerAction.INSTANCE,
                 new RenameLayerAction(null,this),
@@ -302 +309 @@
          * so we get the result at the point 'en' and not some average.
          */
-        double naturalScale = Main.getProjection().getDefaultZoomInPPD();
+        double naturalScale = projection.getDefaultZoomInPPD();
         naturalScale *= 0.01; // make a little smaller
 
-        LatLon ll1 = Main.getProjection().eastNorth2latlon(
+        LatLon ll1 = projection.eastNorth2latlon(
                 new EastNorth(en.east() - naturalScale, en.north()));
-        LatLon ll2 = Main.getProjection().eastNorth2latlon(
+        LatLon ll2 = projection.eastNorth2latlon(
                 new EastNorth(en.east() + naturalScale, en.north()));
 
@@ -316 +323 @@
     /* see getMetersPerEasting */
     private double getMetersPerNorthing(EastNorth en) {
-        double naturalScale = Main.getProjection().getDefaultZoomInPPD();
+        double naturalScale = projection.getDefaultZoomInPPD();
         naturalScale *= 0.01;
 
-        LatLon ll1 = Main.getProjection().eastNorth2latlon(
+        LatLon ll1 = projection.eastNorth2latlon(
                 new EastNorth(en.east(), en.north()- naturalScale));
-        LatLon ll2 = Main.getProjection().eastNorth2latlon(
+        LatLon ll2 = projection.eastNorth2latlon(
                 new EastNorth(en.east(), en.north() + naturalScale));
 
@@ -337 +344 @@
         if ( image == null )
             return;
-        String projcode = Main.getProjection().toCode();
+        String projcode = projection.toCode();
 
         // TODO: bounding box only supported when coordinates are in meters

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

@@ -8 +8 @@
 import javax.imageio.ImageIO;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -53 +52 @@
         LatLon coord2 = new LatLon(cal.getSouth(), cal.getWest());
 
-        EastNorth en1 = Main.getProjection().latlon2eastNorth(coord1);
-        EastNorth en2 = Main.getProjection().latlon2eastNorth(coord2);
+        EastNorth en1 = projection.latlon2eastNorth(coord1);
+        EastNorth en2 = projection.latlon2eastNorth(coord2);