Changeset 3804 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2011-01-23T12:09:17+01:00 (13 years ago)

Author:

bastiK

Message:

paint primitives that are selected and member of a selected relation in selected color (red) and not in memberselected color (pink)

Location:

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

Files:

• MapPaintVisitor.java (modified) (3 diffs)
• MapPainter.java (modified) (1 diff)

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

@@ -523 +523 @@
 
     /* Shows areas before non-areas */
-    public void visitAll(DataSet data, boolean virtual, Bounds bounds) {
+    public void visitAll(final DataSet data, boolean virtual, Bounds bounds) {
         BBox bbox = new BBox(bounds);
         this.data = data;
@@ -634 +634 @@
                                         ((AreaElemStyle)style).getLineStyle().paintPrimitive(osm, paintSettings, painter, true, true);
                                     } else {
-                                        style.paintPrimitive(osm, paintSettings, painter, true, true);
+                                        style.paintPrimitive(osm, paintSettings, painter, data.isSelected(osm), true);
                                     }
                                 }
@@ -640 +640 @@
                                 {
                                     if(isZoomOk(style)) {
-                                        style.paintPrimitive(osm, paintSettings, painter, true, true);
+                                        style.paintPrimitive(osm, paintSettings, painter, data.isSelected(osm), true);
                                     }
                                 }

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

@@ -207 +207 @@
             g.setFont(defaultFont);
         }
-        if (selected)
+        if (selected || member)
         {
-            g.setColor (  member ? relationSelectedColor : selectedColor );
-            g.drawRect (p.x-w/2-2, p.y-h/2-2, w+4, h+4);
+            g.setColor(selected? selectedColor : relationSelectedColor);
+            g.drawRect(p.x-w/2-2, p.y-h/2-2, w+4, h+4);
         }
     }