Changeset 7450 in josm for trunk/src

Timestamp:

2014-08-28T09:57:36+02:00 (10 years ago)

Author:

bastiK

Message:

fixed #10421 - User-settings for mapcss mappaint styles

• only boolean setting for now
• no shortcut support so far

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/MapPaintDialog.java (modified) (3 diffs)
• mappaint/StyleSetting.java (added)
• mappaint/StyleSource.java (modified) (2 diffs)
• mappaint/mapcss/ExpressionFactory.java (modified) (2 diffs)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -35 +35 @@
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
@@ -66 +67 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintSylesUpdateListener;
+import org.openstreetmap.josm.gui.mappaint.StyleSetting;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
@@ -667 +669 @@
             add(reloadAction);
             add(new SaveAsAction());
+
+            JMenu setMenu = new JMenu(tr("Style settings"));
+            setMenu.setIcon(ImageProvider.overlay(ImageProvider.get("preference"),
+                ImageProvider.get("dialogs/mappaint/pencil.png"),
+                ImageProvider.OverlayPosition.SOUTHEAST));
+            add(setMenu);
+
+            int sel = tblStyles.getSelectionModel().getLeadSelectionIndex();
+            StyleSource style = null;
+            if (sel >= 0 && sel < model.getRowCount()) {
+                style = model.getRow(sel);
+            }
+            if (style == null || style.settings.isEmpty()) {
+                setMenu.setEnabled(false);
+            } else {
+                for (StyleSetting s : style.settings) {
+                    s.addMenuEntry(setMenu);
+                }
+            }
+
             addSeparator();
             add(new InfoAction());

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

@@ -11 +11 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.swing.ImageIcon;
@@ -41 +43 @@
 
     public String icon;
+
+    /**
+     * List of settings for user customization.
+     */
+    public final List<StyleSetting> settings = new ArrayList<>();
+    /**
+     * Values of the settings for efficient lookup.
+     */
+    public Map<String, Object> settingValues = new HashMap<>();
 
     public StyleSource(String url, String name, String title) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -18 +18 @@
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -645 +644 @@
         /**
          * Get the number of tags for the current primitive.
-         * @param env
+         * @param env the environment
          * @return number of tags
          */
         public static int number_of_tags(Environment env) {
             return env.osm.getNumKeys();
+        }
+        
+        /**
+         * Get value of a setting.
+         * @param env the environment
+         * @param key setting key (given as layer identifier, e.g. setting::mykey {...})
+         * @return the value of the setting (calculated when the style is loaded)
+         */
+        public static Object setting(Environment env, String key) {
+            return env.source.settingValues.get(key);
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -35 +35 @@
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.gui.mappaint.Range;
+import org.openstreetmap.josm.gui.mappaint.StyleSetting;
+import org.openstreetmap.josm.gui.mappaint.StyleSetting.BooleanStyleSetting;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.SimpleKeyValueCondition;
@@ -70 +72 @@
     private String css = null;
     private ZipFile zipFile;
-
+    
     /**
      * This lock prevents concurrent execution of {@link MapCSSRuleIndex#clear() } /
@@ -224 +226 @@
                     loadMeta();
                     loadCanvas();
+                    loadSettings();
                 } finally {
                     closeSourceInputStream(in);
@@ -276 +279 @@
                         break;
                     case "meta":
+                    case "setting":
                         break;
                     default:
@@ -352 +356 @@
         }
     }
+    
+    private void loadSettings() {
+        settings.clear();
+        settingValues.clear();
+        MultiCascade mc = new MultiCascade();
+        Node n = new Node();
+        String code = LanguageInfo.getJOSMLocaleCode();
+        n.put("lang", code);
+        // create a fake environment to read the meta data block
+        Environment env = new Environment(n, mc, "default", this);
+
+        for (MapCSSRule r : rules) {
+            if ((r.selector instanceof GeneralSelector)) {
+                GeneralSelector gs = (GeneralSelector) r.selector;
+                if (gs.getBase().equals("setting")) {
+                    if (!gs.matchesConditions(env)) {
+                        continue;
+                    }
+                    env.layer = gs.getSubpart();
+                    r.execute(env);
+                }
+            }
+        }
+        for (Entry<String, Cascade> e : mc.getLayers()) {
+            if ("default".equals(e.getKey())) {
+                Main.warn("setting requires layer identifier e.g. 'setting::my_setting {...}'");
+                continue;
+            }
+            Cascade c = e.getValue();
+            String type = c.get("type", null, String.class);
+            StyleSetting set = null;
+            if ("boolean".equals(type)) {
+                set = BooleanStyleSetting.create(c, this, e.getKey());
+            } else {
+                Main.warn("Unkown setting type: "+type);
+            }
+            if (set != null) {
+                settings.add(set);
+                settingValues.put(e.getKey(), set.getValue());
+            }
+        }
+    }
 
     private Cascade constructSpecial(String type) {