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

Timestamp:

2011-11-25T10:42:34+01:00 (13 years ago)

Author:

larry0ua

Message:

'PicLayer - fixing #7075.1'

Location:

applications/editors/josm/plugins/piclayer

Files:

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

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

@@ -22 +22 @@
 -->
 <project name="PicLayer" default="dist" basedir=".">
-    <property name="commit.message" value="PicLayer - fixing #7075.2"/>
+    <property name="commit.message" value="PicLayer - fixing #7075.1"/>
     <property name="plugin.main.version" value="4549"/>
     <!--

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

@@ -38 +38 @@
 /**
  * Action for resetting properties of an image.
- * 
+ *
  * TODO Four almost identical classes. Refactoring needed.
  */
@@ -46 +46 @@
     // Owner layer of the action
     PicLayerAbstract m_owner = null;
-    
+
     /**
      * Constructor
@@ -55 +55 @@
         m_owner = owner;
     }
-    
+
     /**
      * Action handler
      */
+    @Override
     public void actionPerformed(ActionEvent arg0) {
         // Save dialog
@@ -75 +76 @@
                 file = new File( path + CalibrationFileFilter.EXTENSION );
             }
-                        
+
             // Save
             Properties props = new Properties();
             m_owner.saveCalibration(props);
             try {
-                props.store(new FileOutputStream(file), tr("JOSM PicLayer plugin calibration data"));
+                props.store(new FileOutputStream(file), "JOSM PicLayer plugin calibration data");
             } catch (Exception e) {
                 // Error
@@ -86 +87 @@
                 JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage()));
             }
-        }   
+        }
     }
 }

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

@@ -384 +384 @@
         AffineTransform transform;
 
+        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 = Double.valueOf(props.getProperty(INITIAL_SCALE)); //in_scale
         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));
             double angle = Double.valueOf( props.getProperty(ANGLE));
-            double in_scale = Double.valueOf( props.getProperty(INITIAL_SCALE));
             double scale_x = Double.valueOf( props.getProperty(SCALEX));
             double scale_y = Double.valueOf( props.getProperty(SCALEY));
@@ -397 +401 @@
 
             // transform to matrix from these values - need testing
-            transform = AffineTransform.getRotateInstance(angle);
+            transform = AffineTransform.getRotateInstance(angle/180*Math.PI);
             transform.scale(scale_x, scale_y);
             transform.shear(shear_x, shear_y);
-            initialImageScale = in_scale;
         } else {
-            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 = Double.valueOf(props.getProperty(INITIAL_SCALE)); //in_scale
-
             // initialize matrix
             double[] matrix = new double[6];