Changeset 3291 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java

Timestamp:

2010-06-01T19:20:46+02:00 (14 years ago)

Author:

stoecker

Message:

fix #4414 - draw selected relation and selected elements a bit different

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) (8 diffs)

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

@@ -129 +129 @@
 
         if (isZoomOk(nodeStyle)) {
-            nodeStyle.paintPrimitive(n, paintSettings, painter, n.isSelected());
+            nodeStyle.paintPrimitive(n, paintSettings, painter, n.isSelected(),
+            false);
         }
     }
@@ -178 +179 @@
 
         if(wayStyle instanceof LineElemStyle) {
-            wayStyle.paintPrimitive(w, paintSettings, painter, data.isSelected(w));
+            wayStyle.paintPrimitive(w, paintSettings, painter, data.isSelected(w), false);
         } else if (wayStyle instanceof AreaElemStyle) {
             AreaElemStyle areaStyle = (AreaElemStyle) wayStyle;
@@ -189 +190 @@
                 }
             }
-            areaStyle.getLineStyle().paintPrimitive(w, paintSettings, painter, data.isSelected(w));
+            areaStyle.getLineStyle().paintPrimitive(w, paintSettings, painter, data.isSelected(w), false);
         }
     }
@@ -201 +202 @@
                 Way way = (Way)osm;
                 AreaElemStyle areaStyle = (AreaElemStyle)style;
-                areaStyle.getLineStyle().paintPrimitive(way, paintSettings, painter, true);
+                areaStyle.getLineStyle().paintPrimitive(way, paintSettings, painter, true, true);
                 if(area) {
-                    painter.drawArea(getPolygon(way), (areaselected ? paintSettings.getSelectedColor() : areaStyle.color), painter.getAreaName(way));
+                    painter.drawArea(getPolygon(way), (areaselected ? paintSettings.getRelationSelectedColor() : areaStyle.color), painter.getAreaName(way));
                 }
             } else {
-                style.paintPrimitive(osm, paintSettings, painter, true);
+                style.paintPrimitive(osm, paintSettings, painter, true, true);
             }
         }
@@ -212 +213 @@
         {
             if(isZoomOk(style)) {
-                style.paintPrimitive(osm, paintSettings, painter, true);
+                style.paintPrimitive(osm, paintSettings, painter, true, true);
             }
         }
@@ -497 +498 @@
 
                     boolean selected = pd.selected || data.isSelected(r);
-                    painter.drawArea(p, selected ? paintSettings.getSelectedColor() : areaStyle.color, painter.getAreaName(r));
+                    painter.drawArea(p, selected ? paintSettings.getRelationSelectedColor()
+                    : areaStyle.color, painter.getAreaName(r));
                     visible = true;
                 }
@@ -514 +516 @@
                     if(zoomok && (wInner.mappaintDrawnCode != paintid || multipolygon.getOuterWays().isEmpty())) {
                         ((AreaElemStyle)wayStyle).getLineStyle().paintPrimitive(wInner, paintSettings, painter, (data.isSelected(wInner)
-                                || data.isSelected(r)));
+                                || data.isSelected(r)), r.isSelected());
                     }
                     wInner.mappaintDrawnCode = paintid;
@@ -546 +548 @@
                     if(zoomok)
                     {
-                        ((AreaElemStyle)wayStyle).getLineStyle().paintPrimitive(wOuter, paintSettings, painter, (data.isSelected(wOuter) || data.isSelected(r)));
+                        ((AreaElemStyle)wayStyle).getLineStyle().paintPrimitive(wOuter, paintSettings, painter, (data.isSelected(wOuter) || data.isSelected(r)), r.isSelected());
                     }
                     wOuter.mappaintDrawnCode = paintid;