Changeset 4327 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Timestamp:

2011-08-21T13:12:53+02:00 (13 years ago)

Author:

xeen

Message:

updates visual appearance of highlights and adds them to select and delete action

in more detail:

• add target highlighting to select action
• add target cursor to select action
• add target highlighting to delete action
• unify ctrl/alt/shift modifier detection in MapMode actions
• highlights are now a halo around the way/node instead of a color change
• default highlight color is now the same as the select color (red)
• ability to highlight WaySegments and VirtualNodes
• various style/whitespace nits
• fixes #2411

This patch touches a lot of areas, so please report any regressions in the map mode
tools. Also please add a comment to #2411 if you find to highlighting in select
mode distracting, so it can be fine tuned (or turned off by default).

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• MapPainter.java (modified) (21 diffs)
• PaintColors.java (modified) (2 diffs)
• StyledMapRenderer.java (modified) (4 diffs)
• WireframeMapRenderer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.Multipolygon.PolyData;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle;
+import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
+import org.openstreetmap.josm.gui.mappaint.TextElement;
 import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.HorizontalTextAlignment;
 import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.VerticalTextAlignment;
-import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
 import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.Symbol;
-import org.openstreetmap.josm.gui.mappaint.TextElement;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Pair;
@@ -53 +54 @@
     private final boolean inactive;
     private final MapPaintSettings settings;
+    private final Collection<WaySegment> highlightWaySegments;
 
     private final boolean useStrokes;
@@ -64 +66 @@
     private final Color relationSelectedColor;
     private final Color nodeColor;
+    private final Color highlightColor;
+    private final Color highlightColorTransparent;
     private final Color backgroundColor;
 
@@ -81 +85 @@
     public MapPainter(MapPaintSettings settings, Graphics2D g,
             boolean inactive, NavigatableComponent nc, boolean virtual,
-            double circum, boolean leftHandTraffic){
+            double circum, boolean leftHandTraffic,
+            Collection<WaySegment> highlightWaySegments){
         this.settings = settings;
         this.g = g;
         this.inactive = inactive;
         this.nc = nc;
+        this.highlightWaySegments = highlightWaySegments;
         this.useStrokes = settings.getUseStrokesDistance() > circum;
         this.showNames = settings.getShowNamesDistance() > circum;
@@ -96 +102 @@
         this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
         this.nodeColor = PaintColors.NODE.get();
+        this.highlightColor = PaintColors.HIGHLIGHT.get();
+        this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100);
         this.backgroundColor = PaintColors.getBackgroundColor();
 
@@ -131 +139 @@
         List<Node> wayNodes = way.getNodes();
         if (wayNodes.size() < 2) return;
-        
-        Iterator<Point> it = new OffsetIterator(way.getNodes(), offset);
+
+        // only highlight the segment if the way itself is not highlighted
+        if(!way.isHighlighted()) {
+            GeneralPath highlightSegs = null;
+            for(WaySegment ws : highlightWaySegments) {
+                if(ws.way != way || ws.lowerIndex < offset) {
+                    continue;
+                }
+                if(highlightSegs == null) {
+                    highlightSegs = new GeneralPath();
+                }
+
+                Point p1 = nc.getPoint(ws.getFirstNode());
+                Point p2 = nc.getPoint(ws.getSecondNode());
+                highlightSegs.moveTo(p1.x, p1.y);
+                highlightSegs.lineTo(p2.x, p2.y);
+            }
+
+            drawPathHighlight(highlightSegs, line);
+        }
+
+
+        Iterator<Point> it = new OffsetIterator(wayNodes, offset);
         while (it.hasNext()) {
             Point p = it.next();
@@ -209 +238 @@
             lastPoint = p;
         }
+        if(way.isHighlighted()) {
+            drawPathHighlight(path, line);
+        }
         displaySegments(path, orientationArrows, onewayArrows, onewayArrowsCasing, color, line, dashes, dashedColor);
     }
@@ -221 +253 @@
      */
     public class OffsetIterator implements Iterator<Point> {
-        
+
         private List<Node> nodes;
         private int offset;
         private int idx;
-        
+
         private Point prev = null;
         /* 'prev0' is a point that has distance 'offset' from 'prev' and the
@@ -238 +270 @@
             idx = 0;
         }
-        
+
         @Override
         public boolean hasNext() {
@@ -247 +279 @@
         public Point next() {
             if (offset == 0) return nc.getPoint(nodes.get(idx++));
-            
+
             Point current = nc.getPoint(nodes.get(idx));
-            
+
             if (idx == nodes.size() - 1) {
                 ++idx;
@@ -277 +309 @@
                 int dx_prev = current.x - prev.x;
                 int dy_prev = current.y - prev.y;
-                
+
                 // determine intersection of the lines parallel to the two
                 // segments
                 int det = dx_next*dy_prev - dx_prev*dy_next;
-                
+
                 if (det == 0) {
                     ++idx;
@@ -292 +324 @@
                 int m = dx_next*(y_current0 - y_prev0) - dy_next*(x_current0 - x_prev0);
 
-                int cx_ = x_prev0 + (int) Math.round(m * dx_prev / det);
-                int cy_ = y_prev0 + (int) Math.round(m * dy_prev / det);
+                int cx_ = x_prev0 + Math.round(m * dx_prev / det);
+                int cy_ = y_prev0 + Math.round(m * dy_prev / det);
                 ++idx;
                 prev = current;
@@ -307 +339 @@
         }
     }
-    
+
     private void displaySegments(GeneralPath path, GeneralPath orientationArrows, GeneralPath onewayArrows, GeneralPath onewayArrowsCasing,
             Color color, BasicStroke line, BasicStroke dashes, Color dashedColor) {
@@ -337 +369 @@
         if(useStrokes) {
             g.setStroke(new BasicStroke());
+        }
+    }
+
+    /**
+     * highlights a given GeneralPath using the settings from BasicStroke to match the line's
+     * style. Width of the highlight is hard coded.
+     * @param path
+     * @param line
+     */
+    private void drawPathHighlight(GeneralPath path, BasicStroke line) {
+        if(path == null)
+            return;
+        g.setColor(highlightColorTransparent);
+        float w = (line.getLineWidth() + 4);
+        while(w >= line.getLineWidth()) {
+            g.setStroke(new BasicStroke(w, line.getEndCap(), line.getLineJoin(), line.getMiterLimit()));
+            g.draw(path);
+            w -= 4;
         }
     }
@@ -498 +548 @@
     public void drawNodeIcon(Node n, ImageIcon icon, float iconAlpha, boolean selected, boolean member) {
         Point p = nc.getPoint(n);
-        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
-
-        int w = icon.getIconWidth(), h=icon.getIconHeight();
+
+        final int w = icon.getIconWidth(), h=icon.getIconHeight();
+        if(n.isHighlighted()) {
+            drawPointHighlight(p, Math.max(w, h));
+        }
+
         if (iconAlpha != 1f) {
             g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, iconAlpha));
@@ -530 +583 @@
     public void drawNodeSymbol(Node n, Symbol s, Color fillColor, Color strokeColor) {
         Point p = nc.getPoint(n);
-        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
         int radius = s.size / 2;
+
+        if(n.isHighlighted()) {
+            drawPointHighlight(p, s.size);
+        }
 
         if (fillColor != null) {
@@ -612 +668 @@
      */
     public void drawNode(Node n, Color color, int size, boolean fill) {
+        if(size <= 0 && !n.isHighlighted())
+            return;
+
+        Point p = nc.getPoint(n);
+
+        if(n.isHighlighted()) {
+            drawPointHighlight(p, size);
+        }
+
         if (size > 1) {
-            Point p = nc.getPoint(n);
             if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
             int radius = size / 2;
@@ -623 +687 @@
             }
             if (fill) {
-                g.fillRect(p.x - radius, p.y - radius, size + 1, size + 1);
+                g.fillRect(p.x-radius-1, p.y-radius-1, size + 1, size + 1);
             } else {
-                g.drawRect(p.x - radius, p.y - radius, size, size);
-            }
+                g.drawRect(p.x-radius-1, p.y-radius-1, size, size);
+            }
+        }
+    }
+
+    /**
+     * highlights a given point by drawing a rounded rectangle around it. Give the
+     * size of the object you want to be highlighted, width is added automatically.
+     */
+    private void drawPointHighlight(Point p, int size) {
+        g.setColor(highlightColorTransparent);
+        int s = size + 7;
+        while(s >= size) {
+            int r = (int) Math.floor(s/2);
+            g.fillRoundRect(p.x-r, p.y-r, s, s, r, r);
+            s -= 4;
         }
     }
@@ -633 +711 @@
         if (!isShowNames() || bs == null)
             return;
-        
-        Point p = nc.getPoint((Node) n);
+
+        Point p = nc.getPoint(n);
         TextElement text = bs.text;
         String s = text.labelCompositionStrategy.compose(n);
@@ -823 +901 @@
 
     public void drawRestriction(Relation r, NodeElemStyle icon) {
-
         Way fromWay = null;
         Way toWay = null;
@@ -998 +1075 @@
     }
 
-    public void drawVirtualNodes(Collection<Way> ways) {
-
-        if (virtualNodeSize != 0) {
-            GeneralPath path = new GeneralPath();
-            for (Way osm: ways){
-                if (osm.isUsable() && !osm.isDisabled()) {
-                    visitVirtual(path, osm);
-                }
-            }
-            g.setColor(nodeColor);
-            g.draw(path);
-        }
+    public void drawVirtualNodes(Collection<Way> ways, Collection<WaySegment> highlightVirtualNodes) {
+        if (virtualNodeSize == 0)
+            return;
+        // print normal virtual nodes
+        GeneralPath path = new GeneralPath();
+        for (Way osm: ways){
+            if (osm.isUsable() && !osm.isDisabled()) {
+                visitVirtual(path, osm);
+            }
+        }
+        g.setColor(nodeColor);
+        g.draw(path);
+        // print highlighted virtual nodes. Since only the color changes, simply
+        // drawing them over the existing ones works fine (at least in their current
+        // simple style)
+        path = new GeneralPath();
+        for (WaySegment wseg: highlightVirtualNodes){
+            if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
+                visitVirtual(path, wseg.toWay());
+            }
+        }
+        g.setColor(highlightColor);
+        g.draw(path);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.Preferences.ColorKey;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
 
 public enum PaintColors implements ColorKey {
@@ -26 +26 @@
     INCOMPLETE_WAY(marktr("incomplete way"), new Color(0,0,96)), // darker blue
     BACKGROUND(marktr("background"), Color.BLACK),
-    HIGHLIGHT(marktr("highlight"), new Color(0, 255, 186)), // lighteal
+    HIGHLIGHT(marktr("highlight"), SELECTED.get()),
 
     UNTAGGED(marktr("untagged"),Color.GRAY),

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -5 +5 @@
 import java.awt.RenderingHints;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -16 +17 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
@@ -220 +222 @@
                         RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF);
 
-        this.painter = new MapPainter(paintSettings, g, isInactiveMode, nc, renderVirtualNodes, circum, leftHandTraffic);
+        Collection<WaySegment> hws = data.getHighlightedWaySegments();
+
+        this.painter = new MapPainter(paintSettings, g, isInactiveMode, nc, renderVirtualNodes, circum, leftHandTraffic, hws);
 
         StyleCollector sc = new StyleCollector(drawArea, drawMultipolygon, drawRestriction);
@@ -229 +233 @@
         sc.drawAll();
         sc = null;
-        painter.drawVirtualNodes(data.searchWays(bbox));
+        painter.drawVirtualNodes(data.searchWays(bbox), data.getHighlightedVirtualNodes());
 
         //long now = System.currentTimeMillis();

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -168 +169 @@
             }
         }
-        drawVirtualNodes(data.searchWays(bbox));
+        drawVirtualNodes(data.searchWays(bbox), data.getHighlightedVirtualNodes());
+
+        // draw highlighted way segments over the already drawn ways. Otherwise each
+        // way would have to be checked if it contains a way segment to highlight when
+        // in most of the cases there won't be more than one segment. Since the wireframe
+        // renderer does not feature any transparency there should be no visual difference.
+        for(final WaySegment wseg : data.getHighlightedWaySegments()) {
+            drawSegment(nc.getPoint(wseg.getFirstNode()), nc.getPoint(wseg.getSecondNode()), highlightColor, false);
+        }
+        displaySegments();
     }
 
@@ -228 +238 @@
     }
 
-    public void drawVirtualNodes(Collection<Way> ways) {
-
-        if (virtualNodeSize != 0) {
-            GeneralPath path = new GeneralPath();
-            for (Way osm: ways){
-                if (osm.isUsable() && !osm.isDisabledAndHidden() && !osm.isDisabled()) {
-                    visitVirtual(path, osm);
-                }
-            }
-            g.setColor(nodeColor);
-            g.draw(path);
-        }
+    public void drawVirtualNodes(Collection<Way> ways, Collection<WaySegment> highlightVirtualNodes) {
+        if (virtualNodeSize == 0)
+            return;
+        // print normal virtual nodes
+        GeneralPath path = new GeneralPath();
+        for (Way osm : ways) {
+            if (osm.isUsable() && !osm.isDisabledAndHidden() && !osm.isDisabled()) {
+                visitVirtual(path, osm);
+            }
+        }
+        g.setColor(nodeColor);
+        g.draw(path);
+        // print highlighted virtual nodes. Since only the color changes, simply
+        // drawing them over the existing ones works fine (at least in their current
+        // simple style)
+        path = new GeneralPath();
+        for (WaySegment wseg: highlightVirtualNodes){
+            if (wseg.way.isUsable() && !wseg.way.isDisabled()) {
+                visitVirtual(path, wseg.toWay());
+            }
+        }
+        g.setColor(highlightColor);
+        g.draw(path);
     }