Changeset 13177 in josm for trunk/src/org

Timestamp:

2017-12-01T23:17:19+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15605 - fix display of way length in status bar during way creation

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (2 diffs)
• gui/MapStatus.java (modified) (7 diffs)

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

@@ -820 +820 @@
         mouseOnExistingWays = new HashSet<>();
 
-        showStatusInfo(-1, -1, -1, snapHelper.isSnapOn());
-
         if (!ctrl && mousePos != null) {
             currentMouseNode = mv.getNearestNode(mousePos, OsmPrimitive::isSelectable);
@@ -853 +851 @@
             return; // Don't create zero length way segments.
 
+        showStatusInfo(-1, -1, -1, snapHelper.isSnapOn());
 
         double curHdg = Utils.toDegrees(getCurrentBaseNode().getEastNorth()

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

@@ -73 +73 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.preferences.AbstractProperty;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -111 +121 @@
  */
 public final class MapStatus extends JPanel implements
-    Helpful, Destroyable, PreferenceChangedListener, SoMChangeListener, SelectionChangedListener, ZoomChangeListener {
+    Helpful, Destroyable, PreferenceChangedListener, SoMChangeListener, SelectionChangedListener, DataSetListener, ZoomChangeListener {
 
     private final DecimalFormat DECIMAL_FORMAT = new DecimalFormat(Config.getPref().get("statusbar.decimal-format", "0.0"));
@@ -941 +951 @@
 
         Config.getPref().addPreferenceChangeListener(this);
+        DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT);
         SelectionEventManager.getInstance().addSelectionListener(this, FireMode.IN_EDT_CONSOLIDATED);
 
@@ -1126 +1137 @@
         NavigatableComponent.removeZoomChangeListener(this);
         Config.getPref().removePreferenceChangeListener(this);
+        DatasetEventManager.getInstance().removeDatasetListener(this);
         SelectionEventManager.getInstance().removeSelectionListener(this);
         mv.removeComponentListener(mvComponentAdapter);
@@ -1173 +1185 @@
     }
 
-    @Override
-    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+    private void refreshDistText(Collection<? extends OsmPrimitive> newSelection) {
         if (newSelection.size() == 2) {
             Iterator<? extends OsmPrimitive> it = newSelection.iterator();
@@ -1193 +1204 @@
 
     @Override
+    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+        refreshDistText(newSelection);
+    }
+
+    @Override
     public void zoomChanged() {
         if (!GraphicsEnvironment.isHeadless()) {
@@ -1202 +1218 @@
         }
     }
+
+    @Override
+    public void wayNodesChanged(WayNodesChangedEvent event) {
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+        if (ds != null) {
+            Collection<OsmPrimitive> sel = ds.getSelected();
+            if (sel.size() == 1 && sel.contains(event.getChangedWay())) {
+                refreshDistText(sel);
+            }
+        }
+    }
+
+    @Override
+    public void nodeMoved(NodeMovedEvent event) {
+        DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+        if (ds != null) {
+            Collection<OsmPrimitive> sel = ds.getSelected();
+            if (sel.size() == 2 && sel.contains(event.getNode())) {
+                refreshDistText(sel);
+            }
+        }
+    }
+
+    @Override
+    public void primitivesAdded(PrimitivesAddedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void primitivesRemoved(PrimitivesRemovedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void tagsChanged(TagsChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void relationMembersChanged(RelationMembersChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override
+    public void dataChanged(DataChangedEvent event) {
+        // Do nothing
+    }
 }