Changeset 24288 in osm for applications/editors/josm/plugins

Timestamp:

2010-11-17T11:53:34+01:00 (14 years ago)

Author:

ocroquette

Message:

Precision of rotation and scaling is now increased when pressing the SHIFT key

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/ScalePictureActionAbstract.java (modified) (1 diff)

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

@@ -100 +100 @@
     -->
         <target name="revision">
-
-                <!-- extract the SVN revision information for file build.number -->
-                <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
-                        <env key="LANG" value="C"/>
-                        <arg value="info"/>
-                        <arg value="--xml"/>
-                        <arg value="."/>
-                </exec>
                 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-                <delete file="REVISION"/>
         </target>
 

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

@@ -87 +87 @@
         // Rotate the picture
         if(mb_dragging) {
-            // TODO: Magic number
-            m_currentLayer.rotatePictureBy( ( e.getY() - m_prevY ) / 10.0 );
+            double factor;
+            if ( ( e.getModifiersEx() & e.SHIFT_DOWN_MASK ) != 0 ) {
+                factor = Main.pref.getDouble("piclayer.rotatefactors.high_precision", 100.0);
+            }
+            else {
+                factor = Main.pref.getDouble("piclayer.rotatefactors.low_precision", 10.0 );
+            }            
+            m_currentLayer.rotatePictureBy( ( e.getY() - m_prevY ) / factor );
             m_prevY = e.getY();
             Main.map.mapView.repaint();

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

@@ -85 +85 @@
         // Scale the picture
         if(mb_dragging) {
-            doTheScale( ( e.getY() - m_prevY ) / 500.0 );
+            double factor;
+            if ( ( e.getModifiersEx() & e.SHIFT_DOWN_MASK ) != 0 ) {
+                factor = Main.pref.getDouble("piclayer.scalefactors.high_precision", 4000);
+            }
+            else {
+                factor = Main.pref.getDouble("piclayer.scalefactors.low_precision", 400);
+            }            
+            doTheScale( ( e.getY() - m_prevY ) / factor );
             m_prevY = e.getY();
             Main.map.mapView.repaint();