Changeset 23736 in osm for applications/editors/josm

Timestamp:

2010-10-21T23:11:58+02:00 (14 years ago)

Author:

oliverw

Message:

Show track distance in dialog.

Location:

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation

Files:

• ElevationProfileBase.java (modified) (5 diffs)
• IElevationProfile.java (modified) (1 diff)
• gui/ElevationProfileDialog.java (modified) (7 diffs)

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileBase.java

@@ -52 +52 @@
         private int maxHeight;
         private int avrgHeight;
+        private double dist;
         private Date start = new Date();
         private Date end = new Date();
@@ -62 +63 @@
         private int gain;
         private int lastEle;
+        private WayPoint lastWayPoint;
 
         private static boolean ignoreZeroHeight = true;
@@ -133 +135 @@
                 gain = 0;
                 lastEle = 0;
+                dist = 0.0;
 
                 for (WayPoint wayPoint : this.wayPoints) {
@@ -331 +334 @@
         }
         
+        
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.elevation.IElevationProfile#getDistance()
+         */
+        @Override
+        public double getDistance() {
+                return dist / 1000.0; // dist is in meters
+        }
+
         /**
          * Returns the time between start and end of the track.
@@ -474 +486 @@
 
                         sumEle += ele;
-                        lastEle = ele;
-                }
+                        lastEle = ele;                  
+                }
+                
+                // determine distance
+                if (lastWayPoint != null) {
+                        double d = wp.getCoor().greatCircleDistance(lastWayPoint.getCoor());
+                        dist += d;
+                }
+                lastWayPoint = wp;
         }
 }

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/IElevationProfile.java

@@ -62 +62 @@
          */
         public abstract int getMaxHeight();
+        
+        /**
+         * Gets the distance of the track in kilometers.
+         */
+        public abstract double getDistance();
         
         /**

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileDialog.java

@@ -38 +38 @@
 import javax.swing.JTextField;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MapView;
@@ -84 +83 @@
         
         private ElevationProfileLayer profileLayer;
+        private JLabel distLabel;
 
         /**
@@ -133 +133 @@
                 c.gridx = 1;
                 c.gridy = 0;
-                dataPanel.add(new JLabel(tr("Lowest")), c);
+                dataPanel.add(new JLabel(tr("Min")), c);
                 c.gridx = 2;
                 c.gridy = 0;
-                dataPanel.add(new JLabel(tr("Average")), c);
+                dataPanel.add(new JLabel(tr("Avrg")), c);
                 c.gridx = 3;
                 c.gridy = 0;
-                dataPanel.add(new JLabel(tr("Highest")), c);            
+                dataPanel.add(new JLabel(tr("Max")), c);
                 c.gridx = 4;
                 c.gridy = 0;
-                dataPanel.add(new JLabel(tr("Gain ")), c);
+                dataPanel.add(new JLabel(tr("Dist")), c);
                 c.gridx = 5;
                 c.gridy = 0;
-                dataPanel.add(new JLabel(tr("Time ")), c);
+                dataPanel.add(new JLabel(tr("Gain")), c);
+                c.gridx = 6;
+                c.gridy = 0;
+                dataPanel.add(new JLabel(tr("Time")), c);
 
                 // second row
                 c.gridx = 0;
                 c.gridy = 1;
-                dataPanel.add(new JLabel(tr("Elevation")), c);
+                dataPanel.add(new JLabel(tr("Ele")), c);
                 c.gridx = 1;
                 c.gridy = 1;
@@ -168 +171 @@
                 c.gridx = 4;
                 c.gridy = 1;
+                distLabel = new JLabel("0 km");
+                dataPanel.add(distLabel, c);
+                
+                c.gridx = 5;
+                c.gridy = 1;
                 elevationGainLabel = new JLabel("0 m");
                 dataPanel.add(elevationGainLabel, c);
                 
-                c.gridx = 5;
+                c.gridx = 6;
                 c.gridy = 1;
                 totalTimeLabel = new JLabel("0");
@@ -179 +187 @@
                 c.gridx = 0;
                 c.gridy = 2;
-                c.gridwidth = 6;
+                c.gridwidth = 7;
                 dataPanel.add(new JSeparator(), c);
 
@@ -313 +321 @@
                                         .getGain()));
                         totalTimeLabel.setText(String.format("%d:%d h", hours, minutes));
+                        distLabel.setText(String.format("%5.2f km", profile
+                                        .getDistance()));
                 } else {
                         minHeightLabel.setText("-");
@@ -319 +329 @@
                         elevationGainLabel.setText("-");
                         totalTimeLabel.setText("-");
+                        distLabel.setText("-");
                 }