Changeset 13784 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java

Timestamp:

2009-02-18T23:31:32+01:00 (17 years ago)

Author:

pieren

Message:

Fix minor bugs, add the fixed size grab scale configurable, fix pbls in transparency.

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java (modified) (10 diffs)

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -42 +41 @@
     
     private JRadioButton grabMultiplier4 = new JRadioButton("", true);
-    
+
+    static final int DEFAULT_SQUARE_SIZE = 100;
+    private JTextField grabMultiplier4Size = new JTextField(5);
+
     private JCheckBox enableCache = new JCheckBox(tr("Enable automatic caching."));
 
@@ -66 +68 @@
 
         // option to alter the original colors of the wms images
-        alterColors.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                reversGrey.setEnabled(alterColors.isSelected());
-                transparency.setEnabled(alterColors.isSelected());
-                sliderTrans.setEnabled(transparency.isSelected() && alterColors.isSelected());
-            }
-        });
         alterColors.setSelected(Main.pref.getBoolean("cadastrewms.alterColors", false));
         alterColors.setToolTipText(tr("Replace the original white background by the backgound color defined in JOSM preferences."));
@@ -79 +74 @@
         // option to reverse the grey colors (to see texts background)
         reversGrey.setSelected(Main.pref.getBoolean("cadastrewms.invertGrey", false));
-        reversGrey.setToolTipText(tr("Invert the original texts from black to white (and all intermediate greys)."));
+        reversGrey.setToolTipText(tr("Invert the original black and white colors (and all intermediate greys). Useful for texts on dark backgrounds."));
         reversGrey.setEnabled(alterColors.isSelected());
-        cadastrewms.add(reversGrey, GBC.eop().insets(20, 0, 0, 0));
+        cadastrewms.add(reversGrey, GBC.eop().insets(00, 0, 0, 0));
 
         // option to enable transparency
@@ -91 +86 @@
         transparency.setSelected(Main.pref.getBoolean("cadastrewms.backgroundTransparent", false));
         transparency.setToolTipText(tr("Allows multiple layers stacking"));
-        transparency.setEnabled(alterColors.isSelected());
-        cadastrewms.add(transparency, GBC.eop().insets(20, 0, 0, 0));
+        cadastrewms.add(transparency, GBC.eop().insets(0, 0, 0, 0));
 
         // slider for transparency level
-        sliderTrans.setPreferredSize(new Dimension(20,200));
         sliderTrans.setSnapToTicks(true);
         sliderTrans.setToolTipText(tr("Set WMS layers transparency. Right is opaque, left is transparent."));
@@ -114 +107 @@
         cadastrewms.add(jLabelScale, GBC.std().insets(0, 5, 10, 0));
         ButtonGroup bg = new ButtonGroup();
+        ActionListener multiplierActionListener = new ActionListener() {
+            public void actionPerformed(ActionEvent actionEvent) {
+              AbstractButton button = (AbstractButton) actionEvent.getSource();
+              grabMultiplier4Size.setEnabled(button == grabMultiplier4);
+            }
+          };
         grabMultiplier1.setIcon(ImageProvider.get("preferences", "unsel_box_1"));
         grabMultiplier1.setSelectedIcon(ImageProvider.get("preferences", "sel_box_1"));
+        grabMultiplier1.addActionListener( multiplierActionListener);
         grabMultiplier2.setIcon(ImageProvider.get("preferences", "unsel_box_2"));
         grabMultiplier2.setSelectedIcon(ImageProvider.get("preferences", "sel_box_2"));
+        grabMultiplier2.addActionListener( multiplierActionListener);
+        grabMultiplier2.setToolTipText(tr("Grab smaller images (higher quality but use more memory)"));
         grabMultiplier3.setIcon(ImageProvider.get("preferences", "unsel_box_3"));
         grabMultiplier3.setSelectedIcon(ImageProvider.get("preferences", "sel_box_3"));
+        grabMultiplier3.addActionListener( multiplierActionListener);
+        grabMultiplier3.setToolTipText(tr("Grab smaller images (higher quality but use more memory)"));
         grabMultiplier4.setIcon(ImageProvider.get("preferences", "unsel_box_4"));
         grabMultiplier4.setSelectedIcon(ImageProvider.get("preferences", "sel_box_4"));
-        String multiplierTooltip = "Grab smaller images (higher quality but use more memory)";
-        grabMultiplier3.setToolTipText(multiplierTooltip);
+        grabMultiplier4.addActionListener( multiplierActionListener);
+        grabMultiplier4.setToolTipText(tr("Fixed size square (default is 100m)"));
         bg.add(grabMultiplier1);
         bg.add(grabMultiplier2);
         bg.add(grabMultiplier3);
         bg.add(grabMultiplier4);
-        if (Main.pref.get("cadastrewms.scale", "1").equals(Scale.X1))
+        String currentScale = Main.pref.get("cadastrewms.scale", "1");
+        if (currentScale.equals(Scale.X1.value))
             grabMultiplier1.setSelected(true);
-        if (Main.pref.get("cadastrewms.scale", "1").equals(Scale.X2))
+        if (currentScale.equals(Scale.X2.value))
             grabMultiplier2.setSelected(true);
-        if (Main.pref.get("cadastrewms.scale", "1").equals(Scale.X3))
+        if (currentScale.equals(Scale.X3.value))
             grabMultiplier3.setSelected(true);
-        if (Main.pref.get("cadastrewms.scale", "1").equals(Scale.SQUARE_100M))
+        if (currentScale.equals(Scale.SQUARE_100M.value))
             grabMultiplier4.setSelected(true);
         cadastrewms.add(grabMultiplier1, GBC.std().insets(5, 0, 5, 0));
         cadastrewms.add(grabMultiplier2, GBC.std().insets(5, 0, 5, 0));
         cadastrewms.add(grabMultiplier3, GBC.std().insets(5, 0, 5, 0));
-        cadastrewms.add(grabMultiplier4, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 5, 0));
+        cadastrewms.add(grabMultiplier4, GBC.std().insets(5, 0, 5, 0));
+        int squareSize = getNumber("cadastrewms.squareSize", DEFAULT_SQUARE_SIZE);
+        grabMultiplier4Size.setText(String.valueOf(squareSize));
+        grabMultiplier4Size.setToolTipText(tr("Fixed size (from 25 to 1000 meters)"));
+        grabMultiplier4Size.setEnabled(currentScale.equals(Scale.SQUARE_100M.value));
+        cadastrewms.add(grabMultiplier4Size, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 0, 5));
         
         // option to enable automatic caching
@@ -153 +163 @@
 
         // option to fix the cache size(in MB)
-        int size;
-        try {
-            size = Integer.parseInt(Main.pref.get("cadastrewms.cacheSize", String.valueOf(DEFAULT_CACHE_SIZE)));
-        } catch (NumberFormatException e) {
-            size = DEFAULT_CACHE_SIZE;
-        }
+        int size = getNumber("cadastrewms.cacheSize", DEFAULT_CACHE_SIZE);
         cacheSize.setText(String.valueOf(size));
         cacheSize.setToolTipText(tr("Oldest files are automatically deleted when this size is exceeded"));
@@ -182 +187 @@
         else if (grabMultiplier3.isSelected())
             Main.pref.put("cadastrewms.scale", Scale.X3.toString());
-        else
+        else {
             Main.pref.put("cadastrewms.scale", Scale.SQUARE_100M.toString());
+            try {
+                int squareSize = Integer.parseInt(grabMultiplier4Size.getText());
+                if (squareSize >= 25 && squareSize <= 1000)
+                    Main.pref.put("cadastrewms.squareSize", grabMultiplier4Size.getText());
+            } catch (NumberFormatException e) { // ignore the last input
+            }
+        }
         Main.pref.put("cadastrewms.enableCaching", enableCache.isSelected());
         
@@ -190 +202 @@
             CacheControl.cacheSize = Integer.parseInt(cacheSize.getText());
             Main.pref.put("cadastrewms.cacheSize", String.valueOf(CacheControl.cacheSize));
-        } catch (NumberFormatException e) {
-            // ignore the last input
+        } catch (NumberFormatException e) { // ignore the last input
         }
         CacheControl.cacheEnabled = enableCache.isSelected();
@@ -199 +210 @@
     }
 
+    private int getNumber(String pref_parameter, int def_value) {
+        try {
+            return Integer.parseInt(Main.pref.get(pref_parameter, String.valueOf(def_value)));
+        } catch (NumberFormatException e) {
+            return def_value;
+        }
+    }
 }