Changeset 3691 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2010-12-03T00:36:07+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
r3291 r3691 29 29 private boolean fillTaggedNode; 30 30 private boolean fillConnectionNode; 31 private boolean outlineOnly; 31 32 private Color selectedColor; 32 33 private Color relationSelectedColor; … … 78 79 fillTaggedNode = Main.pref.getBoolean("mappaint.node.fill-tagged", true); 79 80 fillConnectionNode = Main.pref.getBoolean("mappaint.node.fill-connection", false); 81 82 outlineOnly = Main.pref.getBoolean("draw.data.area_outline_only", false); 83 80 84 } 81 85 … … 187 191 return fillTaggedNode; 188 192 } 193 194 public boolean isOutlineOnly() { 195 return outlineOnly; 196 } 189 197 } -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java
r3653 r3691 28 28 29 29 public class MapPainter { 30 30 31 private final Graphics2D g; 31 32 private final NavigatableComponent nc; … … 35 36 private final boolean showNames; 36 37 private final boolean showIcons; 38 private final boolean outlineOnly; 37 39 38 40 private final Color inactiveColor; … … 58 60 private static final double sinPHI = Math.sin(PHI); 59 61 60 public MapPainter(MapPaintSettings settings, Graphics2D g, boolean inactive, NavigatableComponent nc, boolean virtual, double dist, double circum) { 62 public MapPainter(MapPaintSettings settings, Graphics2D g, 63 boolean inactive, NavigatableComponent nc, boolean virtual, 64 double dist, double circum) { 65 61 66 this.g = g; 62 67 this.inactive = inactive; … … 65 70 this.showNames = settings.getShowNamesDistance() > dist; 66 71 this.showIcons = settings.getShowIconsDistance() > dist; 72 this.outlineOnly = settings.isOutlineOnly(); 67 73 68 74 this.inactiveColor = PaintColors.INACTIVE.get(); … … 249 255 /* set the opacity (alpha) level of the filled polygon */ 250 256 g.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha)); 251 g.fillPolygon(polygon); 257 258 if (outlineOnly) { 259 g.drawPolygon(polygon); 260 } else { 261 g.fillPolygon(polygon); 262 } 263 252 264 253 265 if (name != null) { -
trunk/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java
r3427 r3691 60 60 private JCheckBox useAntialiasing = new JCheckBox(tr("Smooth map graphics (antialiasing)")); 61 61 private JCheckBox makeAutoMarkers = new JCheckBox(tr("Create markers when reading GPX.")); 62 private JCheckBox outlineOnly = new JCheckBox(tr("Draw only outlines of areas")); 62 63 private JComboBox waypointLabel = new JComboBox(new String[] {tr("Auto"), /* gpx data field name */ trc("gpx_field", "Name"), 63 64 /* gpx data field name */ trc("gpx_field", "Desc(ription)"), tr("Both"), tr("None")}); … … 277 278 panel.add(inactive, GBC.eop().insets(20,0,0,0)); 278 279 280 // outlineOnly 281 outlineOnly.setSelected(Main.pref.getBoolean("draw.data.area_outline_only", false)); 282 outlineOnly.setToolTipText(tr("This option suppresses the filling of areas, overriding anything specified in the selected style.")); 283 panel.add(outlineOnly, GBC.eol().insets(20,0,0,5)); 284 279 285 panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH)); 280 286 scrollpane = new JScrollPane(panel); … … 285 291 public boolean ok() { 286 292 Main.pref.put("marker.makeautomarkers", makeAutoMarkers.isSelected()); 293 Main.pref.put("draw.data.area_outline_only", outlineOnly.isSelected()); 287 294 Main.pref.put("draw.rawgps.lines", drawRawGpsLinesAll.isSelected()); 288 295 Main.pref.put("draw.rawgps.lines.localfiles", drawRawGpsLinesLocal.isSelected());
Note:
See TracChangeset
for help on using the changeset viewer.