Changeset 23757 in osm for applications/editors/josm

Timestamp:

2010-10-22T22:28:37+02:00 (14 years ago)

Author:

oliverw

Message:

• Made min/max bigger
• Avoid overlapping labels

Location:

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

Files:

• DefaultElevationProfileRenderer.java (modified) (5 diffs)
• ElevationProfileLayer.java (modified) (4 diffs)
• IElevationProfileRenderer.java (modified) (1 diff)

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

@@ -27 +27 @@
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -45 +47 @@
          * 
          */
-        private static final int TRIANGLE_BASESIZE = 12;
+        private static final int TRIANGLE_BASESIZE = 24;
         /**
          * 
@@ -63 +65 @@
         // private static final double RAD_270 = Math.PI * 1.5;
         private static final double RAD_90 = Math.PI * 0.5;
+        
+        private List<Rectangle> forbiddenRects = new ArrayList<Rectangle>();
 
         /*
@@ -405 +409 @@
                 int height = g.getFont().getSize() + g.getFontMetrics().getLeading() + 5;
 
+                Rectangle r = new Rectangle(x - (width / 2), y - (height / 2), width, height);
+                
+                if (isForbiddenArea(r)) { 
+                        return; // no space left, skip this label
+                }
+                
                 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                                RenderingHints.VALUE_ANTIALIAS_ON);
-                
+                                RenderingHints.VALUE_ANTIALIAS_ON);             
                 GradientPaint gradient = new GradientPaint(x, y, Color.WHITE, x, y
-                                + height, secondGradColor, false);
+                                + (height/2), secondGradColor, false);
                 g2d.setPaint(gradient);         
 
-                Rectangle r = new Rectangle(x - (width / 2), y - (height / 2), width, height);
+                
                 g2d.fillRoundRect(r.x, r.y, r.width, r.height, ROUND_RECT_RADIUS, ROUND_RECT_RADIUS);
                 
@@ -419 +428 @@
                 g2d.drawRoundRect(r.x, r.y, r.width, r.height, ROUND_RECT_RADIUS, ROUND_RECT_RADIUS);           
                 g2d.drawString(s, x - (width / 2) + 5, y + (height / 2) - 3);
+                
+                forbiddenRects.add(r);
+        }
+        
+        /**
+         * Checks, if the rectangle has been 'reserved' by a previous draw action.
+         * @param r The area to check for.
+         * @return true; if area is already occupied by another rectangle.
+         */
+        private boolean isForbiddenArea(Rectangle r) {
+                
+                for (Rectangle rTest : forbiddenRects) {
+                        if (r.intersects(rTest)) return true;
+                }
+                return false;
+        }
+
+        @Override
+        public void beginRendering() {
+                forbiddenRects.clear();
+        }
+
+        @Override
+        public void finishRendering() {
+                // nothing to do currently              
         }
 }

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

@@ -18 +18 @@
 
 import java.awt.Graphics2D;
+
 import javax.swing.Action;
 import javax.swing.Icon;
@@ -44 +45 @@
         private IElevationProfile profile;
         private IElevationProfileRenderer renderer = new DefaultElevationProfileRenderer();
-        private WayPoint selWayPoint = null;
+        private WayPoint selWayPoint = null;    
 
         /**
@@ -158 +159 @@
 
                 if (profile != null) {
+                        renderer.beginRendering();
                         for (WayPoint wpt : profile.getWayPoints()) {
                                 int ele = (int) WayPointHelper.getElevation(wpt);
@@ -207 +209 @@
                         System.err.println("Layer#paint: No profile");
                 }
+                
+                renderer.finishRendering();
         }
 

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

@@ -50 +50 @@
          */
         void renderWayPoint(Graphics g, IElevationProfile profile, MapView mv, WayPoint wpt, ElevationWayPointKind kind);
+        
+        /**
+         * Notifies the renderer that rendering starts.
+         */
+        void beginRendering();
+        
+        /**
+         * Notifies the renderer that rendering has been finished.
+         */
+        void finishRendering();
 }