Changeset 23734 in osm for applications/editors

Timestamp:

2010-10-21T22:37:58+02:00 (14 years ago)

Author:

oliverw

Message:

Simplified paint method; avoid selected way point to get hidden behind other way points.

File:

• applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/ElevationProfileLayer.java (modified) (3 diffs)

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

@@ -161 +161 @@
                                 int ele = (int) WayPointHelper.getElevation(wpt);
 
-                                if (selWayPoint == null) {
-                                        if (lastWpt != null) {                                  
-                                                int h1 = WayPointHelper.getHourOfWayPoint(wpt);
-                                                int h2 = WayPointHelper.getHourOfWayPoint(lastWpt);
-                                                if (h1 != h2) { // hour changed?
-                                                        renderer.renderWayPoint(g, profile, mv, wpt,
-                                                                        ElevationWayPointKind.FullHour);
-                                                } else { // check for elevation gain
-                                                        if (ele > lastEle) {
-                                                                renderer.renderWayPoint(g, profile, mv, wpt,
-                                                                                ElevationWayPointKind.ElevationGain);
-                                                        } else {
-                                                                renderer.renderWayPoint(g, profile, mv, wpt,
-                                                                                ElevationWayPointKind.ElevationLoss);
-                                                        }
-                                                }
-                                        }
-                                } else {
-                                        if (selWayPoint == wpt)  {
+                                if (lastWpt != null) {                                  
+                                        int h1 = WayPointHelper.getHourOfWayPoint(wpt);
+                                        int h2 = WayPointHelper.getHourOfWayPoint(lastWpt);
+                                        if (h1 != h2) { // hour changed?
                                                 renderer.renderWayPoint(g, profile, mv, wpt,
-                                                        ElevationWayPointKind.Highlighted);
-                                        } else {
+                                                                ElevationWayPointKind.FullHour);
+                                        } else { // check for elevation gain
                                                 if (ele > lastEle) {
                                                         renderer.renderWayPoint(g, profile, mv, wpt,
@@ -193 +178 @@
                                 }
 
-                                // remember for next iteration
+                                // remember some things for next iteration
                                 lastEle = (int) WayPointHelper.getElevation(wpt);
                                 lastWpt = wpt;
@@ -199 +184 @@
                         }
 
+                        // paint selected way point, if available
+                        if (selWayPoint != null) {
+                                renderer.renderWayPoint(g, profile, mv, selWayPoint,
+                                                ElevationWayPointKind.Highlighted);
+                        }
+
+                        // paint start/end
                         renderer.renderWayPoint(g, profile, mv, profile.getStartWayPoint(),
                                         ElevationWayPointKind.StartPoint);
                         renderer.renderWayPoint(g, profile, mv, profile.getEndWayPoint(),
                                         ElevationWayPointKind.EndPoint);
+                        // paint min/max
                         renderer.renderWayPoint(g, profile, mv, profile.getMaxWayPoint(),
                                         ElevationWayPointKind.MaxElevation);