Changeset 17108 in josm for trunk/src/org

Timestamp:

2020-10-08T09:56:37+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19887: Parallel ways tool: bottom toolbar unusable to view offset measurement

• implememt new method MapStatus.setAutoLength()
• ParallelWayAction calls it with false in enterMode()
• call it in MapMode.enterMode() to make sure that it is reenabled even if ParallelWayAction.exitMode() is not called.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/MapMode.java (modified) (1 diff)
• actions/mapmode/ParallelWayAction.java (modified) (3 diffs)
• gui/MapStatus.java (modified) (3 diffs)

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

@@ -74 +74 @@
         readPreferences();
         MainApplication.getMap().mapView.setNewCursor(cursor, this);
+        MainApplication.getMap().statusLine.setAutoLength(true);
         updateStatusLine();
     }

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

@@ -164 +164 @@
         setMode(Mode.NORMAL);
         pWays = null;
-
         super.enterMode();
+
+        // #19887: overwrite default: we want to show the distance to the original way
+        MainApplication.getMap().statusLine.setAutoLength(false);
 
         mv.addMouseListener(this);
@@ -187 +189 @@
         MapFrame map = MainApplication.getMap();
         map.statusLine.setDist(-1);
-        map.statusLine.repaint();
+        map.statusLine.setAutoLength(true);
         map.keyDetector.removeModifierExListener(this);
         removeWayHighlighting(sourceWays);
@@ -332 +334 @@
         } else if (mode == Mode.DRAGGING) {
             clearSourceWays();
+            MainApplication.getMap().statusLine.setDist(pWays.getWays());
         }
 

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

@@ -763 +763 @@
     };
 
+    /** see #19887: determine if the {@code distValue} field should be filled with length of selected object */
+    private boolean autoLength = true;
+
     private void registerListeners() {
         // Listen to keyboard/mouse events for pressing/releasing alt key and inform the collector.
@@ -1186 +1189 @@
 
     private void refreshDistText(Collection<? extends OsmPrimitive> newSelection) {
+        if (!autoLength) {
+            return;
+        }
+
         if (newSelection.size() == 2) {
             Iterator<? extends OsmPrimitive> it = newSelection.iterator();
@@ -1264 +1271 @@
         }
     }
+
+    /**
+     * Enable or disable the automatic refresh of the length field.
+     * @param b if {@code true} the automatic refresh is enabled, else disabled
+     * @since 17108
+     */
+    public void setAutoLength(boolean b) {
+        autoLength = b;
+    }
+
+
 }