Changeset 12400 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

Timestamp:

2017-06-11T22:26:15+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14929 - Automatic filters on numeric tag values (level, layer, maxspeed, voltage)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.gui.autofilter.AutoFilterManager;
+import org.openstreetmap.josm.gui.autofilter.AutoFilterRule;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -21 +23 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -48 +51 @@
     private final JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
     private final JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys"));
+    private final JCheckBox autoFilters = new JCheckBox(tr("Use auto filters"));
+    private final JLabel lblRule = new JLabel(tr("Rule"));
+    private final JosmComboBox<AutoFilterRule> autoFilterRules = new JosmComboBox<>(
+            AutoFilterManager.getInstance().getAutoFilterRules().toArray(new AutoFilterRule[] {}));
 
     // Options that affect performance
@@ -131 +138 @@
         discardableKeys.setSelected(Main.pref.getBoolean("display.discardable-keys", false));
 
+        // auto filters
+        autoFilters.setToolTipText(tr("Display buttons to automatically filter numeric values of a predefined tag"));
+        autoFilters.setSelected(AutoFilterManager.PROP_AUTO_FILTER_ENABLED.get());
+        autoFilters.addActionListener(e -> {
+            lblRule.setEnabled(autoFilters.isSelected());
+            autoFilterRules.setEnabled(autoFilters.isSelected());
+        });
+        autoFilterRules.setToolTipText("Rule defining which tag will provide automatic filters, below a certain zoom level");
+        autoFilterRules.setSelectedItem(AutoFilterManager.getInstance().getAutoFilterRule(AutoFilterManager.PROP_AUTO_FILTER_RULE.get()));
+
         JLabel performanceLabel = new JLabel(tr("Options that affect drawing performance"));
 
@@ -157 +174 @@
         panel.add(inactive, GBC.eop().insets(20, 0, 0, 0));
         panel.add(discardableKeys, GBC.eop().insets(20, 0, 0, 0));
+        panel.add(autoFilters, GBC.eop().insets(20, 0, 0, 0));
+        panel.add(lblRule, GBC.std().insets(40, 0, 0, 0));
+        panel.add(autoFilterRules, GBC.eop().fill(GBC.HORIZONTAL).insets(5, 0, 0, 0));
 
         ExpertToggleAction.addVisibilitySwitcher(performanceLabel);
@@ -188 +208 @@
         Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
         Main.pref.put("display.discardable-keys", discardableKeys.isSelected());
+        AutoFilterManager.PROP_AUTO_FILTER_ENABLED.put(autoFilters.isSelected());
+        AutoFilterManager.PROP_AUTO_FILTER_RULE.put(((AutoFilterRule) autoFilterRules.getSelectedItem()).getKey());
         int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
         if (virtualNodes.isSelected()) {