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

Timestamp:

2013-06-21T00:29:01+02:00 (11 years ago)

Author:

pieren

Message:

Change some default preference values. Fix in grab plan image case where mouse clic is outside the image.

Location:

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

Files:

• CadastrePreferenceSetting.java (modified) (2 diffs)
• MenuActionGrabPlanImage.java (modified) (1 diff)
• WMSLayer.java (modified) (2 diffs)

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

@@ -86 +86 @@
     private JTextField cacheSize = new JTextField(20);
 
-    static final String DEFAULT_RASTER_DIVIDER = "5";
+    static final String DEFAULT_RASTER_DIVIDER = "7";
     private JTextField rasterDivider = new JTextField(10);
 
     static final int DEFAULT_CROSSPIECES = 0;
+    
+    static final String DEFAULT_GRAB_MULTIPLIER = Scale.SQUARE_100M.value;
 
     public CadastrePreferenceSetting() {
@@ -220 +222 @@
         bgGrabMultiplier.add(grabMultiplier3);
         bgGrabMultiplier.add(grabMultiplier4);
-        String currentScale = Main.pref.get("cadastrewms.scale", "1");
+        String currentScale = Main.pref.get("cadastrewms.scale", DEFAULT_GRAB_MULTIPLIER);
         if (currentScale.equals(Scale.X1.value))
             grabMultiplier1.setSelected(true);

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

@@ -145 +145 @@
             handleNewCoordinates(ea.east(), ea.north());
         } else {
-            countMouseClicked++;
             // ignore clicks outside the image
             if (ea.east() < wmsLayer.getImage(0).min.east() || ea.east() > wmsLayer.getImage(0).max.east()
                     || ea.north() < wmsLayer.getImage(0).min.north() || ea.north() > wmsLayer.getImage(0).max.north())
+            {
+                System.out.println("ignore clic outside the image");
                 return;
+            }
+            countMouseClicked++;
             if (mode == cGetCorners) {
                 if (countMouseClicked == 1) {

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

@@ -162 +162 @@
                         CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
             } else
-                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", Scale.X1.toString())));
+                divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.scale", CadastrePreferenceSetting.DEFAULT_GRAB_MULTIPLIER)));
         }
         grabThread.addImages(dividedBbox);
@@ -194 +194 @@
             // divide to fixed size squares
             // grab all square in a spiral starting from the center (usually the most interesting place)
-            int c = Integer.parseInt(Main.pref.get("cadastrewms.squareSize", "100"));
+            int c = Integer.parseInt(Main.pref.get("cadastrewms.squareSize", String.valueOf(CadastrePreferenceSetting.DEFAULT_SQUARE_SIZE)));
             lambertMin = lambertMin.add(- minEast%c, - minNorth%c);
             lambertMax = lambertMax.add(c - lambertMax.east()%c, c - lambertMax.north()%c);