Changeset 7549 in josm for trunk

Timestamp:

2014-09-16T21:28:53+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10307 - improvements to rendering of relations in wireframe mode

Location:

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

Files:

• AbstractMapRenderer.java (modified) (3 diffs)
• StyledMapRenderer.java (modified) (2 diffs)
• WireframeMapRenderer.java (modified) (5 diffs)

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

@@ -38 +38 @@
     /** Color Preference for selected objects */
     protected Color selectedColor;
+    /** Color Preference for members of selected relations */
+    protected Color relationSelectedColor;
     /** Color Preference for nodes */
     protected Color nodeColor;
@@ -70 +72 @@
 
     /**
-     * Draw the node as small rectangle with the given color.
+     * Draw the node as small square with the given color.
      *
      * @param n  The node to draw.
      * @param color The color of the node.
+     * @param size size in pixels
+     * @param fill determines if the square mmust be filled
      */
     public abstract void drawNode(Node n, Color color, int size, boolean fill);
@@ -151 +155 @@
         this.inactiveColor = PaintColors.INACTIVE.get();
         this.selectedColor = PaintColors.SELECTED.get();
+        this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
         this.nodeColor = PaintColors.NODE.get();
         this.highlightColor = PaintColors.HIGHLIGHT.get();

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

@@ -285 +285 @@
     private MapPaintSettings paintSettings;
 
-    private Color relationSelectedColor;
     private Color highlightColorTransparent;
 
@@ -1356 +1355 @@
     public void getColors() {
         super.getColors();
-        this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
         this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100);
         this.backgroundColor = PaintColors.getBackgroundColor();

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

@@ -32 +32 @@
  * A map renderer that paints a simple scheme of every primitive it visits to a
  * previous set graphic environment.
+ * @since 23
  */
 public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor {
@@ -153 +154 @@
      * @param bounds display boundaries
      */
-    @SuppressWarnings("unchecked")
     @Override
     public void render(DataSet data, boolean virtual, Bounds bounds) {
@@ -246 +246 @@
             if (isInactiveMode || n.isDisabled()) {
                 color = inactiveColor;
-            } else if (ds.isSelected(n)) {
+            } else if (n.isSelected()) {
                 color = selectedColor;
+            } else if (n.isMemberOfSelected()) {
+                color = relationSelectedColor;
             } else if (n.isConnectionNode()) {
                 if (isNodeTagged(n)) {
@@ -300 +302 @@
         if (isInactiveMode || w.isDisabled()) {
             wayColor = inactiveColor;
-        } else if(w.isHighlighted()) {
+        } else if (w.isHighlighted()) {
             wayColor = highlightColor;
-        } else if(ds.isSelected(w)) {
+        } else if (w.isSelected()) {
             wayColor = selectedColor;
+        } else if (w.isMemberOfSelected()) {
+            wayColor = relationSelectedColor;
         } else if (!w.isTagged()) {
             wayColor = untaggedWayColor;
@@ -355 +359 @@
                 }
 
-                g.drawOval(p.x-3, p.y-3, 6, 6);
+                g.drawOval(p.x-4, p.y-4, 9, 9);
             } else if (m.isWay()) {
                 GeneralPath path = new GeneralPath();