Changeset 4990 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-02-19T02:20:18+01:00 (13 years ago)

Author:

Don-vip

Message:

fix #7161 - Show distance of moved node in history window

File:

• trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.history.HistoryNode;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -39 +40 @@
     /** the info panel for coordinates for the node in role CURRENT_POINT_IN_TIME */
     private LatLonViewer currentLatLonViewer;
+    /** the info panel for distance between the two coordinates */
+    private DistanceViewer distanceViewer;
 
     protected void build() {
@@ -83 +86 @@
         gc.anchor = GridBagConstraints.NORTHWEST;
         add(currentLatLonViewer = new LatLonViewer(model, PointInTimeType.CURRENT_POINT_IN_TIME), gc);
+
+        // --------------------
+        // the distance panel
+        gc.gridx = 0;
+        gc.gridy = 2;
+        gc.gridwidth = 2;
+        gc.fill = GridBagConstraints.HORIZONTAL;
+        gc.weightx = 1.0;
+        gc.weighty = 0.0;
+        add(distanceViewer = new DistanceViewer(model), gc);
     }
 
@@ -110 +123 @@
             model.deleteObserver(referenceLatLonViewer);
         }
+        if (distanceViewer != null) {
+            model.deleteObserver(distanceViewer);
+        }
     }
 
@@ -124 +140 @@
         if (referenceLatLonViewer != null) {
             model.addObserver(referenceLatLonViewer);
+        }
+        if (distanceViewer != null) {
+            model.addObserver(distanceViewer);
         }
     }
@@ -261 +280 @@
         }
     }
+    
+    private static class DistanceViewer extends LatLonViewer {
+
+        private JLabel lblDistance;
+        
+        public DistanceViewer(HistoryBrowserModel model) {
+            super(model, PointInTimeType.REFERENCE_POINT_IN_TIME);
+        }
+
+        protected void build() {
+            setLayout(new GridBagLayout());
+            setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
+            GridBagConstraints gc = new GridBagConstraints();
+
+            // --------
+            gc.gridx = 0;
+            gc.gridy = 0;
+            gc.fill = GridBagConstraints.NONE;
+            gc.weightx = 0.0;
+            gc.insets = new Insets(5,5,5,5);
+            gc.anchor = GridBagConstraints.NORTHWEST;
+            add(new JLabel(tr("Distance: ")), gc);
+
+            // --------
+            gc.gridx = 1;
+            gc.gridy = 0;
+            gc.fill = GridBagConstraints.HORIZONTAL;
+            gc.weightx = 1.0;
+            add(lblDistance = new JLabel(), gc);
+            lblDistance.setBackground(Color.WHITE);
+            lblDistance.setOpaque(true);
+            lblDistance.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+        }
+
+        protected void refresh() {
+            HistoryOsmPrimitive p = getPrimitive();
+            HistoryOsmPrimitive opposite = getOppositePrimitive();
+            if (p == null || ! ( p instanceof HistoryNode)) return;
+            if (opposite == null || ! (opposite instanceof HistoryNode)) return;
+            HistoryNode node = (HistoryNode) p;
+            HistoryNode oppositeNode = (HistoryNode) opposite;
+
+            // update distance
+            //
+            double distance = node.getCoords().greatCircleDistance(oppositeNode.getCoords());
+            if (distance > 0) {
+                lblDistance.setBackground(BGCOLOR_DIFFERENCE);
+            } else {
+                lblDistance.setBackground(Color.WHITE);
+            }
+            lblDistance.setText(NavigatableComponent.getDistText(distance));
+        }
+    }
 }