Changeset 19894 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2010-02-06T23:41:55+01:00 (14 years ago)

Author:

pieren

Message:

from Clément Ménier, new option allowing an auto-selection of the first cadastre layer for grab

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CadastrePlugin.java (modified) (1 diff)
• CadastrePreferenceSetting.java (modified) (4 diffs)
• WMSDownloadAction.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

@@ -97 +97 @@
  *                 - cache management compatible with previous v2 format
  *                 - raster image rotation using shift+ctrl key instead of ctrl
- *                 - raster image adjustment using default system menu modifier (ctrl for windows) for Mac support  
+ *                 - raster image adjustment using default system menu modifier (ctrl for windows) for Mac support
+ *                 - from Clément Ménier, new option allowing an auto-selection of the first cadastre layer for grab  
  */
 public class CadastrePlugin extends Plugin {

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -55 +54 @@
     private JRadioButton crosspiece4 = new JRadioButton("100m");
 
+    private JCheckBox autoFirstLayer = new JCheckBox(tr("Automaticly select first WMS layer when grabing if multiple layers exist."));
+    
     static final int DEFAULT_SQUARE_SIZE = 100;
     private JTextField grabMultiplier4Size = new JTextField(5);
@@ -224 +225 @@
         cadastrewms.add(jLabelCacheSize, GBC.std().insets(20, 0, 0, 0));
         cadastrewms.add(cacheSize, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 200, 5));
-        
+        // separator
+        cadastrewms.add(new JSeparator(SwingConstants.HORIZONTAL), GBC.eol().fill(GBC.HORIZONTAL));
+        autoFirstLayer.setSelected(Main.pref.getBoolean("cadastrewms.autoFirstLayer", false));
+        autoFirstLayer.setToolTipText(tr("Automatically selects the first WMS layer if multiple layers exist when grabbing."));
+        cadastrewms.add(autoFirstLayer, GBC.eop().insets(0, 0, 0, 0));
         cadastrewms.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
 
@@ -271 +276 @@
         } catch (NumberFormatException e) { // ignore the last input
         }
+        Main.pref.put("cadastrewms.autoFirstLayer", autoFirstLayer.isSelected());
         CacheControl.cacheEnabled = enableCache.isSelected();
         CadastrePlugin.refreshConfiguration();

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java

@@ -41 +41 @@
             if (existingWMSlayers.size() == 0)
                 return new MenuActionNewLocation().addNewLayer(existingWMSlayers);
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("More than one WMS layer present\nSelect one of them first, then retry"));
+            if (Main.pref.getBoolean("cadastrewms.autoFirstLayer", false)) {
+                return existingWMSlayers.get(0);
+            } else {
+                JOptionPane.showMessageDialog(Main.parent,
+                        tr("More than one WMS layer present\nSelect one of them first, then retry"));
+            }
         } else {
             return new MenuActionNewLocation().addNewLayer(existingWMSlayers);