Changeset 17321 in osm for applications/editors

Timestamp:

2009-08-28T17:53:09+02:00 (15 years ago)

Author:

tstelmach

Message:

Scaling in one axis, new icons

Location:

applications/editors/josm/plugins/piclayer

Files:

• README (modified) (1 diff)
• images/mapmode/move.png (modified) ( previous)
• images/mapmode/rotate.png (modified) ( previous)
• images/mapmode/scale.png (modified) ( previous)
• images/mapmode/scale_x.png (added)
• images/mapmode/scale_y.png (added)
• src/org/openstreetmap/josm/plugins/piclayer/HelpAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/piclayer/ScalePictureAction.java (deleted)
• src/org/openstreetmap/josm/plugins/piclayer/ScalePictureActionAbstract.java (added)
• src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java (added)
• src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java (added)
• src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java (added)

applications/editors/josm/plugins/piclayer/README

@@ -10 +10 @@
 Step 2b) If you chose a clipboard, please wait. For some reason it takes time. To be fixed later.
 NOTE) If something failed, you should get a message box. If not - check the console for messages (Linux only?)
-Step 3) Once the image is visible you may start positioning it. For that - select the PicLayer in the layers list.
+Step 3) Once the image is visible you may start positioning it. For that - select the PicLayer in the layers list and activate it (!).
 Step 4) Start aligning the image.
 Step 4a) Move the image by choosing 'Move' from the toolbar and draggin the mouse around with left button pressed.

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

@@ -64 +64 @@
             + "NOTE) If something failed, you should get a message box. If not - check the console for messages (Linux only?)"
             + "\n"
-            + "Step 3) Once the image is visible you may start positioning it. For that - select the PicLayer in the layers list."
+            + "Step 3) Once the image is visible you may start positioning it. For that - select the PicLayer in the layers list and activate it (!!!)."
             + "\n"
             + "Step 4) Start aligning the image."
@@ -73 +73 @@
             + "\n"
             + "Step 4c) Scale the image by choosing 'Scale' from the toolbar and draggin the mouse up/down with left button pressed."
+            + "\n"
+            + "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."

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

@@ -60 +60 @@
     private double m_angle = 0.0;
     // Scale of the image
-    private double m_scale = 1.0;
+    private double m_scalex = 1.0;
+    private double m_scaley = 1.0;
     // The scale that was set on the map during image creation
     private double m_initial_scale = 0;
@@ -190 +191 @@
             g.rotate( m_angle * Math.PI / 180.0 );
             // Scale
-            double scale = m_scale * m_initial_scale / Main.map.mapView.getDist100Pixel();
-            g.scale( scale, scale );
+            double scalex = m_scalex * m_initial_scale / Main.map.mapView.getDist100Pixel();
+            double scaley = m_scaley * m_initial_scale / Main.map.mapView.getDist100Pixel();
+            g.scale( scalex, scaley );
 
             // Draw picture
@@ -222 +224 @@
      * Scales the picture. Scaled in... don't know but works ok :)
      */
-    public void scalePictureBy( double scale ) {
-        m_scale += scale;
+    public void scalePictureBy( double scalex, double scaley ) {
+        m_scalex += scalex;
+        m_scaley += scaley;
     }
 
@@ -244 +247 @@
      */
     public void resetScale() {
-        m_scale = 1.0;
+        m_scalex = 1.0;
+        m_scaley = 1.0;
     }
 

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

@@ -42 +42 @@
         private IconToggleButton m_movePictureButton = null;
         private IconToggleButton m_rotatePictureButton = null;
-        private IconToggleButton m_scalePictureButton = null;
+        private IconToggleButton m_scalexPictureButton = null;
+        private IconToggleButton m_scaleyPictureButton = null;
+        private IconToggleButton m_scalexyPictureButton = null;
         
         // Menu actions
@@ -81 +83 @@
                 MovePictureAction movePictureAction = new MovePictureAction(newFrame);
                 RotatePictureAction rotatePictureAction = new RotatePictureAction(newFrame);
-                ScalePictureAction scalePictureAction = new ScalePictureAction(newFrame);
+                ScaleXYPictureAction scaleXYPictureAction = new ScaleXYPictureAction(newFrame);
+                ScaleXPictureAction scaleXPictureAction = new ScaleXPictureAction(newFrame);
+                ScaleYPictureAction scaleYPictureAction = new ScaleYPictureAction(newFrame);
                 // Create plugin buttons and add them to the toolbar
                 m_movePictureButton = new IconToggleButton(movePictureAction);
-                m_rotatePictureButton = new IconToggleButton(rotatePictureAction);
-                m_scalePictureButton = new IconToggleButton(scalePictureAction);
+            m_rotatePictureButton = new IconToggleButton(rotatePictureAction);
+            m_scalexyPictureButton = new IconToggleButton(scaleXYPictureAction);
+            m_scalexPictureButton = new IconToggleButton(scaleXPictureAction);
+            m_scaleyPictureButton = new IconToggleButton(scaleYPictureAction);
             newFrame.addMapMode(m_movePictureButton);
             newFrame.addMapMode(m_rotatePictureButton);
-            newFrame.addMapMode(m_scalePictureButton);
-            newFrame.toolGroup.add(m_movePictureButton);
-            newFrame.toolGroup.add(m_rotatePictureButton);
-            newFrame.toolGroup.add(m_scalePictureButton);
-            // Hide them by default
+            newFrame.addMapMode(m_scalexyPictureButton);
+            newFrame.addMapMode(m_scalexPictureButton);
+            newFrame.addMapMode(m_scaleyPictureButton);
+//            newFrame.toolGroup.add(m_movePictureButton);
+//            newFrame.toolGroup.add(m_rotatePictureButton);
+//            newFrame.toolGroup.add(m_scalePictureButton);
+            // Show them by default
             m_movePictureButton.setVisible(true);
             m_rotatePictureButton.setVisible(true);
-            m_scalePictureButton.setVisible(true);
+            m_scalexyPictureButton.setVisible(true);
+            m_scalexPictureButton.setVisible(true);
+            m_scaleyPictureButton.setVisible(true);
         }
     }
@@ -103 +113 @@
          */
         public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                m_movePictureButton.setEnabled( newLayer instanceof PicLayerAbstract );         
-                m_rotatePictureButton.setEnabled( newLayer instanceof PicLayerAbstract );               
-                m_scalePictureButton.setEnabled( newLayer instanceof PicLayerAbstract );
         }