Changeset 3291 in josm for trunk/src/org

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPaintSettings.java (modified) (3 diffs)
• data/osm/visitor/paint/MapPaintVisitor.java (modified) (8 diffs)
• data/osm/visitor/paint/MapPainter.java (modified) (5 diffs)
• data/osm/visitor/paint/PaintColors.java (modified) (1 diff)
• gui/DefaultNameFormatter.java (modified) (1 diff)
• gui/mappaint/AreaElemStyle.java (modified) (1 diff)
• gui/mappaint/ElemStyle.java (modified) (1 diff)
• gui/mappaint/IconElemStyle.java (modified) (1 diff)
• gui/mappaint/LineElemStyle.java (modified) (4 diffs)
• gui/mappaint/SimpleNodeElemStyle.java (modified) (2 diffs)

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

@@ -30 +30 @@
     private boolean fillConnectionNode;
     private Color selectedColor;
+    private Color relationSelectedColor;
     private Color highlightColor;
     private Color inactiveColor;
@@ -49 +50 @@
 
         selectedColor = PaintColors.SELECTED.get();
+        relationSelectedColor = PaintColors.RELATIONSELECTED.get();
         highlightColor = PaintColors.HIGHLIGHT.get();
         inactiveColor = PaintColors.INACTIVE.get();
@@ -100 +102 @@
     public Color getSelectedColor() {
         return selectedColor;
+    }
+
+    public Color getRelationSelectedColor() {
+        return relationSelectedColor;
     }
 

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;

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

@@ -39 +39 @@
     private final Color textColor;
     private final Color selectedColor;
+    private final Color relationSelectedColor;
     private final Color areaTextColor;
     private final Color nodeColor;
@@ -64 +65 @@
         this.textColor = PaintColors.TEXT.get();
         this.selectedColor = PaintColors.SELECTED.get();
+        this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
         this.areaTextColor = PaintColors.AREA_TEXT.get();
         this.nodeColor = PaintColors.NODE.get();
@@ -181 +183 @@
     }
 
-    public void drawNodeIcon(Node n, ImageIcon icon, boolean selected, String name) {
+    public void drawNodeIcon(Node n, ImageIcon icon, boolean selected, boolean member, String name) {
         Point p = nc.getPoint(n);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
@@ -200 +202 @@
         if (selected)
         {
-            g.setColor (  selectedColor );
+            g.setColor (  member ? relationSelectedColor : selectedColor );
             g.drawRect (p.x-w/2-2, p.y-h/2-2, w+4, h+4);
         }
@@ -298 +300 @@
 
         if (selected) {
-            g.setColor(selectedColor);
+            g.setColor(relationSelectedColor);
             g.drawRect((int)(pVia.x+vx+vx2)-w/2-2,(int)(pVia.y+vy+vy2)-h/2-2, w+4, h+4);
         }

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

@@ -13 +13 @@
     INACTIVE(marktr("inactive"), Color.darkGray),
     SELECTED(marktr("selected"), Color.red),
+    RELATIONSELECTED(marktr("Relation: selected"), Color.magenta),
     NODE(marktr("Node: standard"), Color.yellow),
     CONNECTION(marktr("Node: connection"), Color.yellow),

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -169 +169 @@
             name = tr("incomplete");
         } else {
-            name = relation.get("type");
+            name = tr(relation.get("type"));
             if (name == null) {
                 name = (relation.get("public_transport") != null) ? tr("public transport") : "";

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

@@ -48 +48 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
         // TODO
         /*Way way = (Way)primitive;

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

@@ -53 +53 @@
     }
 
-    public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected);
+    public abstract void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member);
 }

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

@@ -39 +39 @@
     }
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, MapPainter painter, boolean selected) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, MapPainter painter, boolean selected, boolean member) {
         if (painter.isShowIcons()) {
             Node n = (Node) primitive;
             String name = painter.isShowNames() && annotate?painter.getNodeName(n):null;
-            painter.drawNodeIcon(n, (painter.isInactive() || n.isDisabled())?getDisabledIcon():icon, selected, name);
+            painter.drawNodeIcon(n, (painter.isInactive() || n.isDisabled())?getDisabledIcon():icon, selected, member, name);
         } else {
-            SimpleNodeElemStyle.INSTANCE.paintPrimitive(primitive, settings, painter, selected);
+            SimpleNodeElemStyle.INSTANCE.paintPrimitive(primitive, settings, painter, selected, member);
         }
 

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

@@ -139 +139 @@
 
     @Override
-    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected) {
+    public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
         Way w = (Way)primitive;
         /* show direction arrows, if draw.segment.relevant_directions_only is not set,
@@ -180 +180 @@
             myColor = paintSettings.getHighlightColor();
         } else if (selected) {
-            myColor = paintSettings.getSelectedColor();
+            myColor = member ? paintSettings.getRelationSelectedColor() : paintSettings.getSelectedColor();
         } else if(w.isDisabled()) {
             myColor = paintSettings.getInactiveColor();
@@ -189 +189 @@
             for(LineElemStyle s : overlays) {
                 if(!s.over) {
-                    painter.drawWay(w, s.color != null && selected ? myColor: s.color, s.getWidth(myWidth),
+                    painter.drawWay(w, (s.color == null || selected) ? myColor: s.color, s.getWidth(myWidth),
                             s.getDashed(), s.dashedColor, false, false, false);
                 }
@@ -202 +202 @@
             for(LineElemStyle s : overlays) {
                 if(s.over) {
-                    painter.drawWay(w, s.color != null && selected ? myColor : s.color, s.getWidth(myWidth),
+                    painter.drawWay(w, (s.color == null || selected) ? myColor : s.color, s.getWidth(myWidth),
                             s.getDashed(), s.dashedColor, false, false, false);
                 }

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

@@ -23 +23 @@
     @Override
     public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings settings, MapPainter painter,
-            boolean selected) {
+            boolean selected, boolean member) {
         Node n = (Node)primitive;
         String name = painter.isShowNames()?painter.getNodeName(n):null;
@@ -37 +37 @@
                 color = settings.getInactiveColor();
             } else if (selected) {
-                color = settings.getSelectedColor();
+                color = member ? settings.getRelationSelectedColor() : settings.getSelectedColor();
             } else if (n.isConnectionNode()) {
                 if (n.isTagged()) {