Changeset 3804 in josm

Timestamp:

Jan 23, 2011 12:09:17 PM (2 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

Files:

• data/osm/visitor/paint/MapPaintVisitor.java (modified) (3 diffs)
• data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• gui/mappaint/LineElemStyle.java (modified) (1 diff)
• gui/mappaint/SimpleNodeElemStyle.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);
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -181 +181 @@
             markColor = paintSettings.getHighlightColor();
         } else if (selected) {
-            markColor = member ? paintSettings.getRelationSelectedColor() : paintSettings.getSelectedColor();
+            markColor = paintSettings.getSelectedColor();
+        } else if (member) {
+            markColor = paintSettings.getRelationSelectedColor();
         } else if(w.isDisabled()) {
             markColor = paintSettings.getInactiveColor();

trunk/src/org/openstreetmap/josm/gui/mappaint/SimpleNodeElemStyle.java

@@ -38 +38 @@
                 color = settings.getInactiveColor();
             } else if (selected) {
-                color = member ? settings.getRelationSelectedColor() : settings.getSelectedColor();
+                color = settings.getSelectedColor();
+            } else if (member) {
+                color = settings.getRelationSelectedColor();
             } else if (isConnection) {
                 if (n.isTagged()) {