Changeset 7549 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2014-09-16T21:28:53+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
r6069 r7549 38 38 /** Color Preference for selected objects */ 39 39 protected Color selectedColor; 40 /** Color Preference for members of selected relations */ 41 protected Color relationSelectedColor; 40 42 /** Color Preference for nodes */ 41 43 protected Color nodeColor; … … 70 72 71 73 /** 72 * Draw the node as small rectangle with the given color.74 * Draw the node as small square with the given color. 73 75 * 74 76 * @param n The node to draw. 75 77 * @param color The color of the node. 78 * @param size size in pixels 79 * @param fill determines if the square mmust be filled 76 80 */ 77 81 public abstract void drawNode(Node n, Color color, int size, boolean fill); … … 151 155 this.inactiveColor = PaintColors.INACTIVE.get(); 152 156 this.selectedColor = PaintColors.SELECTED.get(); 157 this.relationSelectedColor = PaintColors.RELATIONSELECTED.get(); 153 158 this.nodeColor = PaintColors.NODE.get(); 154 159 this.highlightColor = PaintColors.HIGHLIGHT.get(); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r7509 r7549 285 285 private MapPaintSettings paintSettings; 286 286 287 private Color relationSelectedColor;288 287 private Color highlightColorTransparent; 289 288 … … 1356 1355 public void getColors() { 1357 1356 super.getColors(); 1358 this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();1359 1357 this.highlightColorTransparent = new Color(highlightColor.getRed(), highlightColor.getGreen(), highlightColor.getBlue(), 100); 1360 1358 this.backgroundColor = PaintColors.getBackgroundColor(); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java
r7022 r7549 32 32 * A map renderer that paints a simple scheme of every primitive it visits to a 33 33 * previous set graphic environment. 34 * @since 23 34 35 */ 35 36 public class WireframeMapRenderer extends AbstractMapRenderer implements Visitor { … … 153 154 * @param bounds display boundaries 154 155 */ 155 @SuppressWarnings("unchecked")156 156 @Override 157 157 public void render(DataSet data, boolean virtual, Bounds bounds) { … … 246 246 if (isInactiveMode || n.isDisabled()) { 247 247 color = inactiveColor; 248 } else if ( ds.isSelected(n)) {248 } else if (n.isSelected()) { 249 249 color = selectedColor; 250 } else if (n.isMemberOfSelected()) { 251 color = relationSelectedColor; 250 252 } else if (n.isConnectionNode()) { 251 253 if (isNodeTagged(n)) { … … 300 302 if (isInactiveMode || w.isDisabled()) { 301 303 wayColor = inactiveColor; 302 } else if (w.isHighlighted()) {304 } else if (w.isHighlighted()) { 303 305 wayColor = highlightColor; 304 } else if (ds.isSelected(w)) {306 } else if (w.isSelected()) { 305 307 wayColor = selectedColor; 308 } else if (w.isMemberOfSelected()) { 309 wayColor = relationSelectedColor; 306 310 } else if (!w.isTagged()) { 307 311 wayColor = untaggedWayColor; … … 355 359 } 356 360 357 g.drawOval(p.x- 3, p.y-3, 6, 6);361 g.drawOval(p.x-4, p.y-4, 9, 9); 358 362 } else if (m.isWay()) { 359 363 GeneralPath path = new GeneralPath();
Note:
See TracChangeset
for help on using the changeset viewer.