Changeset 17632 in josm for trunk/src/org

Timestamp:

2021-03-21T23:03:04+01:00 (4 years ago)

Author:

simon04

Message:

fix #20101 - Rotate & scale tool: show angle or scale factor in status bar

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/DrawSnapHelper.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• command/RotateCommand.java (modified) (1 diff)
• command/ScaleCommand.java (modified) (1 diff)
• gui/MapStatus.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -881 +881 @@
             return; // Don't create zero length way segments.
 
-        showStatusInfo(-1, -1, -1, snapHelper.isSnapOn());
+        showStatusInfo(Double.NaN, -1, -1, snapHelper.isSnapOn());
 
         double curHdg = Utils.toDegrees(getCurrentBaseNode().getEastNorth()

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java

@@ -341 +341 @@
         EastNorth p0 = drawAction.getCurrentBaseNode().getEastNorth();
         EastNorth snapPoint = currentEN;
-        double angle = -1;
+        double angle = Double.NaN;
 
         double activeBaseHeading = (customBaseHeading >= 0) ? customBaseHeading : baseHeading;

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -59 +59 @@
 import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -768 +769 @@
                 if (doesImpactStatusLine(affectedNodes, ways)) {
                     MainApplication.getMap().statusLine.setDist(ways);
+                }
+                if (c instanceof RotateCommand) {
+                    double angle = Utils.toDegrees(((RotateCommand) c).getRotationAngle());
+                    MainApplication.getMap().statusLine.setAngle(angle);
+                } else if (c instanceof ScaleCommand) {
+                    // U+00D7 MULTIPLICATION SIGN
+                    String angle = String.format("%.2f", ((ScaleCommand) c).getScalingFactor()) + " \u00d7";
+                    MainApplication.getMap().statusLine.setAngleText(angle);
                 }
                 return true;

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -79 +79 @@
 
     /**
+     * Returns the rotation angle.
+     * @return The rotation angle
+     */
+    public double getRotationAngle() {
+        return rotationAngle;
+    }
+
+    /**
      * Rotate nodes.
      */

trunk/src/org/openstreetmap/josm/command/ScaleCommand.java

@@ -75 +75 @@
 
     /**
+     * Returns the scaling factor.
+     * @return The scaling factor
+     */
+    public double getScalingFactor() {
+        return scalingFactor;
+    }
+
+    /**
      * Scale nodes.
      */

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -1085 +1085 @@
 
     /**
+     * Sets the angle to display in the angle panel. NaN yields "--".
+     * @param a The angle
+     */
+    public void setAngle(double a) {
+        angleText.setText(!Double.isFinite(a) ? "--" : DECIMAL_FORMAT.format(a) + " \u00B0");
+    }
+
+    /**
      * Sets the angle to display in the angle panel
-     * @param a The angle
-     */
-    public void setAngle(double a) {
-        angleText.setText(a < 0 ? "--" : DECIMAL_FORMAT.format(a) + " \u00B0");
+     * @param text The angle text
+     */
+    public void setAngleText(String text) {
+        angleText.setText(text);
     }