Changeset 5991 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

Timestamp:

2013-06-06T01:48:06+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8752 - update distance text in status line when rescaling ways

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (3 diffs)

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

@@ -711 +711 @@
             startEN = currentEN; // drag can continue after scaling/rotation
     
+            if (mode != Mode.rotate && mode != Mode.scale) {
+                return false;
+            }
+            
+            getCurrentDataSet().beginUpdate();
+            
             if (mode == Mode.rotate) {
-                getCurrentDataSet().beginUpdate();
                 if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand) c).getTransformedNodes())) {
                     ((RotateCommand) c).handleEvent(currentEN);
@@ -719 +724 @@
                 }
             } else if (mode == Mode.scale) {
-                getCurrentDataSet().beginUpdate();
                 if (c instanceof ScaleCommand && affectedNodes.equals(((ScaleCommand) c).getTransformedNodes())) {
                     ((ScaleCommand) c).handleEvent(currentEN);
@@ -725 +729 @@
                     Main.main.undoRedo.add(new ScaleCommand(selection, currentEN));
                 }
-            } else {
-                return false;
+            }
+            
+            Collection<Way> ways = getCurrentDataSet().getSelectedWays();
+            if (doesImpactStatusLine(affectedNodes, ways)) {
+                Main.map.statusLine.setDist(ways);
             }
         }
         getCurrentDataSet().endUpdate();
         return true;
+    }
+    
+    private boolean doesImpactStatusLine(Collection<Node> affectedNodes, Collection<Way> selectedWays) {
+        for (Way w : selectedWays) {
+            for (Node n : w.getNodes()) {
+                if (affectedNodes.contains(n)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }