Changeset 23759 in osm for applications/editors/josm

Timestamp:

2010-10-23T00:37:00+02:00 (14 years ago)

Author:

oliverw

Message:

• Bugfix: Remove layer data when no GPX layer is left
• Removed some debug output

Location:

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

Files:

• ElevationProfileDialog.java (modified) (7 diffs)
• ElevationProfileLayer.java (modified) (2 diffs)

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

@@ -63 +63 @@
                 ComponentListener {
 
+        private static final String EMPTY_DATA_STRING = "-";
         /**
          * 
@@ -246 +247 @@
         public void setModel(IElevationProfile model) {
                 if (this.profile != model) {
-                        if (model != null) {
-                                // System.out.println("Set model " + model);
-                                this.profile = model;
-                                profPanel.setElevationModel(model);
-                                updateView();
-                        }
+                        this.profile = model;
+                        profPanel.setElevationModel(model);
+                        
+                        updateView();
                 }
         }
@@ -282 +281 @@
          */
         private void updateView() {
-                if (profile == null) { // emergency exit
-                        setTitle(String.format("%s: (No data)", tr("Elevation Profile")));
-                        return;
-                }
-                
-                // Show name of profile in title 
-                setTitle(String.format("%s: %s", tr("Elevation Profile"), profile.getName()));
-                
-                if (profile.hasElevationData()) {
+                if (profile != null) {
+                        // Show name of profile in title 
+                        setTitle(String.format("%s: %s", tr("Elevation Profile"), profile.getName()));
+
+                        if (profile.hasElevationData()) {
                         // Show elevation data
                         minHeightLabel.setText(
@@ -300 +295 @@
                         elevationGainLabel.setText(
                                         NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getGain()));
-                } else { // no elevation data
-                        minHeightLabel.setText("-");
-                        maxHeightLabel.setText("-");
-                        avrgHeightLabel.setText("-");
-                        elevationGainLabel.setText("-");
-                }
-
-                // compute values for time and distance
-                long diff = profile.getTimeDifference();
-                long minutes = diff / (1000 * 60);
-                long hours = minutes / 60;
-                minutes = minutes % 60;
-                
-                double dist = profile.getDistance();
-
-                totalTimeLabel.setText(String.format("%d:%d h", hours, minutes));
-                distLabel.setText(NavigatableComponent.getSystemOfMeasurement().getDistText(dist));
+                        }
+                        
+                        // compute values for time and distance
+                        long diff = profile.getTimeDifference();
+                        long minutes = diff / (1000 * 60);
+                        long hours = minutes / 60;
+                        minutes = minutes % 60;
+                        
+                        double dist = profile.getDistance();
+
+                        totalTimeLabel.setText(String.format("%d:%d h", hours, minutes));
+                        distLabel.setText(NavigatableComponent.getSystemOfMeasurement().getDistText(dist));
+                } else { // no elevation data, -> switch back to empty view
+                        setTitle(String.format("%s: (No data)", tr("Elevation Profile")));
+                        
+                        minHeightLabel.setText(EMPTY_DATA_STRING);
+                        maxHeightLabel.setText(EMPTY_DATA_STRING);
+                        avrgHeightLabel.setText(EMPTY_DATA_STRING);
+                        elevationGainLabel.setText(EMPTY_DATA_STRING);
+                        totalTimeLabel.setText(EMPTY_DATA_STRING);
+                        distLabel.setText(EMPTY_DATA_STRING);
+                }
                 
                 fireModelChanged();
@@ -414 +414 @@
                         }
                         
-                        System.out.println("Active layer: " + newLayer.getName());
                         ElevationModel em = layerMap.get(newLayer);
                         em.setSliceSize(slices);
@@ -424 +423 @@
         public void layerAdded(Layer newLayer) {
                 createLayer(newLayer);
-                System.out.println("layerAdded: " + newLayer.getName());
         }
 
@@ -432 +430 @@
                         layerMap.remove(oldLayer);
                 }
-
+                if (layerMap.size() == 0) {
+                        setModel(null);
+                        profileLayer.setProfile(null);
+                }
         }
 

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

@@ -158 +158 @@
                 int index = 0;
 
-                if (profile != null) {
-                        renderer.beginRendering();
+                renderer.beginRendering();
+                if (profile != null) {                  
                         for (WayPoint wpt : profile.getWayPoints()) {
                                 int ele = (int) WayPointHelper.getElevation(wpt);
@@ -206 +206 @@
                         renderer.renderWayPoint(g, profile, mv, profile.getMinWayPoint(),
                                         ElevationWayPointKind.MinElevation);
-                } else {
-                        System.err.println("Layer#paint: No profile");
-                }
+                } 
                 
                 renderer.finishRendering();