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

Timestamp:

2009-08-28T22:06:42+02:00 (15 years ago)

Author:

tstelmach

Message:

Saving / loading image calibration

Location:

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

Files:

• CalibrationFileFilter.java (added)
• HelpAction.java (modified) (1 diff)
• LoadPictureCalibrationAction.java (added)
• PicLayerAbstract.java (modified) (4 diffs)
• PicLayerFromClipboard.java (modified) (1 diff)
• PicLayerFromFile.java (modified) (1 diff)
• ResetPictureAllAction.java (modified) (1 diff)
• ResetPictureAngleAction.java (modified) (1 diff)
• ResetPicturePositionAction.java (modified) (1 diff)
• ResetPictureScaleAction.java (modified) (1 diff)
• SavePictureCalibrationAction.java (added)

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

@@ -76 +76 @@
             + "Step 4d) You can also choose to scale in just one axis by selecting the proper button."
             + "\n"
-            + "NOTE) If it does not work - make sure the right layer is selected."
+            + "NOTE) If it does not work - make sure the right layer is selected AND ACTIVATED."
             + "\n"
             + "Step 5) If you need to reset your changes - you can use the popup menu available under the PicLayer entry in the layer list."
+            + "\n"
+            + "Step 6) If you want to save the calibraton of the picture you have made, you can also do this using the popup menu."
             + "\n\n"
             + "This plugin is meant to help with mapping from photos (for me it's mostly buildings) for people who simply don't like MetaCarta Rectifier (like me)."

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

@@ -29 +29 @@
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.util.Properties;
+
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -68 +70 @@
     // Layer icon
     private Icon m_layericon = null;
+    
+    // Keys for saving in Properties
+    private final String INITIAL_POS_X = "INITIAL_POS_X";
+    private final String INITIAL_POS_Y = "INITIAL_POS_y";
+    private final String POSITION_X = "POSITION_X";
+    private final String POSITION_Y = "POSITION_Y";
+    private final String ANGLE = "ANGLE";
+    private final String INITIAL_SCALE = "INITIAL_SCALE";
+    private final String SCALEX = "SCALEX";
+    private final String SCALEY = "SCALEY";
 
     /**
@@ -89 +101 @@
         m_popupmenu = new Component[]{
                 reset_submenu,
+                new JSeparator(),
+                new JMenuItem( new SavePictureCalibrationAction(this)),
+                new JMenuItem( new LoadPictureCalibrationAction(this)),
                 new JSeparator(),
                 new JMenuItem( new HelpAction() )
@@ -263 +278 @@
 
     }
+
+    /**
+     * Saves the calibration data into properties structure
+     * @param props Properties to save to
+     */
+    public void saveCalibration( Properties props ) {
+        // Save
+        props.put(INITIAL_POS_X, "" + m_initial_position.getX());
+        props.put(INITIAL_POS_Y, "" + m_initial_position.getY());
+        props.put(POSITION_X, "" + m_position.getX());
+        props.put(POSITION_Y, "" + m_position.getY());
+        props.put(INITIAL_SCALE, "" + m_initial_scale);
+        props.put(SCALEX, "" + m_scalex);
+        props.put(SCALEY, "" + m_scaley);
+        props.put(ANGLE, "" + m_angle);
+    }
+    
+    /**
+     * Loads calibration data from properties structure
+     * @param props Properties to load from
+     * @return
+     */
+    public void loadCalibration( Properties props ) {
+        // Load
+                double pos_x = Double.valueOf( props.getProperty(POSITION_X));
+                double pos_y = Double.valueOf( props.getProperty(POSITION_Y));
+                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));
+                        m_position.setLocation(pos_x, pos_y);
+                m_initial_position.setLocation(pos_x, pos_y);
+                m_angle = angle;
+                m_scalex = scale_x;
+                m_scaley = scale_y;
+                m_initial_scale = in_scale;
+                // Refresh
+            Main.map.mapView.repaint();
+    }
 }

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

@@ -61 +61 @@
         @Override
         protected String getPicLayerName() {
-                return super.name + " <Clipboard>";
+                return "Clipboard";
         }
 

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

@@ -40 +40 @@
         m_file = file;
         // Generate tooltip text
-        m_tooltiptext = super.name + " <" + m_file.getAbsolutePath() + ">";
+        m_tooltiptext = m_file.getAbsolutePath();
     }   
     

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

@@ -39 +39 @@
          */
         public ResetPictureAllAction( PicLayerAbstract owner ) {
-                super("All", null, null, null, false);
+                super("All", null, "Resets picture calibration", null, false);
                 // Remember the owner...
                 m_owner = owner;

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

@@ -39 +39 @@
          */
         public ResetPictureAngleAction( PicLayerAbstract owner ) {
-                super("Angle", null, null, null, false);
+                super("Angle", null, "Resets picture rotation", null, false);
                 // Remember the owner...
                 m_owner = owner;

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

@@ -39 +39 @@
          */
         public ResetPicturePositionAction( PicLayerAbstract owner ) {
-                super("Position", null, null, null, false);
+                super("Position", null, "Resets picture position", null, false);
                 // Remember the owner...
                 m_owner = owner;

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

@@ -39 +39 @@
          */
         public ResetPictureScaleAction( PicLayerAbstract owner ) {
-                super("Scale", null, null, null, false);
+                super("Scale", null, "Resets picture scale", null, false);
                 // Remember the owner...
                 m_owner = owner;