Changeset 23753 in osm

Timestamp:

2010-10-22T20:57:08+02:00 (14 years ago)

Author:

oliverw

Message:

Fixed/unified radius of spheres in layer.

File:

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

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

@@ -48 +48 @@
          * 
          */
-        private static final int REGULAR_WPT_RADIUS = 2;
+        private static final int BASIC_WPT_RADIUS = 2;
+        private static final int REGULAR_WPT_RADIUS = BASIC_WPT_RADIUS * 4;
+        private static final int BIG_WPT_RADIUS = BASIC_WPT_RADIUS * 10;
+        
         // predefined colors
         private static final Color HIGH_COLOR = ElevationColors.EPMidBlue;
@@ -172 +175 @@
 
                 int rad = REGULAR_WPT_RADIUS;
-                int r2 = rad * 4;
                 g.setColor(c);
                 //g.drawOval(pnt.x - rad, pnt.y - rad, r2, r2);
-                drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, r2);
+                drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, rad);
                 
                 if (kind == ElevationWayPointKind.FullHour) {
@@ -186 +188 @@
                         int hour = WayPointHelper.getHourOfWayPoint(wpt);                       
                         int min = WayPointHelper.getMinuteOfWayPoint(wpt);
-                        drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, r2 * 2);
+                        drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, BIG_WPT_RADIUS);
                         drawLabel(String.format("%02d:%02d", hour, min), pnt.x, pnt.y - g.getFontMetrics().getHeight(), g);
                         drawLabel(String.format("%dm", eleH), pnt.x, pnt.y + g.getFontMetrics().getHeight(), g);
@@ -335 +337 @@
                 Color c = getColorForWaypoint(profile, wpt, kind);
                 Point pnt = mv.getPoint(wpt.getEastNorth());
-                drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, REGULAR_WPT_RADIUS * 5);
+                drawSphere(g, Color.WHITE, c, pnt.x, pnt.y, BIG_WPT_RADIUS);
         }