Changeset 6499 in josm for trunk/src

Timestamp:

2013-12-19T20:56:03+01:00 (11 years ago)

Author:

simon04

Message:

Add checkbox to main menu to toggle hatched background rendering of areas outside of the downloaded areas

This is useful, e.g, for mapping public transport relations when one
downloads a relation modify by id and missing stops by bbox.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HatchAreaOutsideDownloadAction.java (added)
• actions/PreferenceToggleAction.java (modified) (3 diffs)
• gui/MainMenu.java (modified) (3 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java

@@ -7 +7 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 public class PreferenceToggleAction extends JosmAction implements PreferenceChangedListener {
 
-    private final JCheckBoxMenuItem checkbox;
-    private final String prefKey;
-    private final boolean prefDefault;
+    protected final JCheckBoxMenuItem checkbox;
+    protected final BooleanProperty property;
 
     public PreferenceToggleAction(String name, String tooltip, String prefKey, boolean prefDefault) {
+        this(name, tooltip, new BooleanProperty(prefKey, prefDefault));
+    }
+
+    public PreferenceToggleAction(String name, String tooltip, BooleanProperty property) {
         super(name, null, tooltip, null, false);
-        putValue("toolbar", "toggle-" + prefKey);
-        this.prefKey = prefKey;
-        this.prefDefault = prefDefault;
+        CheckParameterUtil.ensureParameterNotNull(property, "property");
+        putValue("toolbar", "toggle-" + property.getKey());
+        this.property = property;
         this.checkbox = new JCheckBoxMenuItem(this);
-        this.checkbox.setSelected(Main.pref.getBoolean(prefKey, prefDefault));
+        this.checkbox.setSelected(property.get());
         Main.pref.addPreferenceChangeListener(this);
     }
@@ -26 +31 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Main.pref.put(prefKey, checkbox.isSelected());
+        property.put(checkbox.isSelected());
     }
 
@@ -35 +40 @@
     @Override
     public void preferenceChanged(Preferences.PreferenceChangeEvent e) {
-        if (prefKey.equals(e.getKey())) {
-            checkbox.setSelected(Main.pref.getBoolean(prefKey, prefDefault));
+        if (property.getKey().equals(e.getKey())) {
+            checkbox.setSelected(property.get());
         }
     }

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

@@ -47 +47 @@
 import org.openstreetmap.josm.actions.FullscreenToggleAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
+import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
 import org.openstreetmap.josm.actions.HelpAction;
 import org.openstreetmap.josm.actions.HistoryInfoAction;
@@ -199 +200 @@
     /** View -> Wireframe View */
     public final WireframeToggleAction wireFrameToggleAction = new WireframeToggleAction();
+    public final HatchAreaOutsideDownloadAction hatchAreaOutsideDownloadAction = new HatchAreaOutsideDownloadAction();
     public final JosmAction toggleGPXLines = new ToggleGPXLinesAction();
     /** View -> Advanced info */
@@ -643 +645 @@
         wireframe.setAccelerator(wireFrameToggleAction.getShortcut().getKeyStroke());
         wireFrameToggleAction.addButtonModel(wireframe.getModel());
+        final JCheckBoxMenuItem hatchAreaOutsideDownloadMenuItem = hatchAreaOutsideDownloadAction.getCheckbox();
+        viewMenu.add(hatchAreaOutsideDownloadMenuItem);
+        ExpertToggleAction.addVisibilitySwitcher(hatchAreaOutsideDownloadMenuItem);
 
         viewMenu.add(new MapPaintMenu());

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -41 +41 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
@@ -317 +318 @@
 
             // paint remainder
-            g.setPaint(hatched);
-            g.fill(a);
+            if (HatchAreaOutsideDownloadAction.isHatchEnabled()) {
+                g.setPaint(hatched);
+                g.fill(a);
+            }
         }