Changeset 27142 in osm for applications

Timestamp:

2011-11-25T09:43:52+01:00 (13 years ago)

Author:

larry0ua

Message:

'PicLayer - fixing #7075.2'

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (modified) (3 diffs)

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

@@ -22 +22 @@
 -->
 <project name="PicLayer" default="dist" basedir=".">
-    <property name="commit.message" value="PicLayer - selection points are enlarged to 10 px"/>
+    <property name="commit.message" value="PicLayer - fixing #7075.2"/>
     <property name="plugin.main.version" value="4549"/>
     <!--

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

@@ -360 +360 @@
         props.put(POSITION_X, Double.toString(imagePosition.getX()));
         props.put(POSITION_Y, Double.toString(imagePosition.getY()));
+        props.put(INITIAL_SCALE, Double.toString(initialImageScale));
     }
 
@@ -383 +384 @@
         AffineTransform transform;
 
-        if (props.containsKey(INITIAL_POS_X)) {// old format
+        if (props.containsKey(SCALEX)) {// old format
             double in_pos_x = Double.valueOf( props.getProperty(INITIAL_POS_X));
             double in_pos_y = Double.valueOf( props.getProperty(INITIAL_POS_Y));
@@ -401 +402 @@
             initialImageScale = in_scale;
         } else {
-            double pos_x = Double.valueOf( props.getProperty(POSITION_X));
-            double pos_y = Double.valueOf( props.getProperty(POSITION_Y));
+            double pos_x = Double.valueOf(props.getProperty(POSITION_X));
+            double pos_y = Double.valueOf(props.getProperty(POSITION_Y));
+
             imagePosition = new EastNorth(pos_x, pos_y);
-            initialImageScale = 1; //in_scale
+            initialImageScale = Double.valueOf(props.getProperty(INITIAL_SCALE)); //in_scale
 
             // initialize matrix