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

Timestamp:

2009-08-23T21:23:13+02:00 (16 years ago)

Author:

pieren

Message:

improve georeferencing action cancellation; fixed bug of raster image loaded from cache not working on Java1.6; improve mouse click bounce detection during georeferencing process

File:

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

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

@@ -4 +4 @@
 
 import java.awt.GridBagLayout;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
@@ -37 +36 @@
     private int cGetLambertCrosspieces = 2;
     private EastNorth ea1;
-    private Point mousePrevious = new Point();
+    private long mouseClickedTime = 0;
     private EastNorth georefpoint1;
     private EastNorth georefpoint2;
+    /**
+     * The time which needs to pass between two clicks during georeferencing, in milliseconds
+     */
+    private int initialClickDelay;
 
     public MenuActionGrabPlanImage() {
@@ -48 +51 @@
         countMouseClicked = 0;
         mode = 0;
-        mousePrevious.setLocation(0, 0);
+        mouseClickedTime = System.currentTimeMillis();
     }
     
@@ -75 +78 @@
                 downloadWMSPlanImage = new DownloadWMSPlanImage();
                 downloadWMSPlanImage.download(wmsLayer);
+                initialClickDelay = Main.pref.getInteger("cadastrewms.georef-click-delay",200);
                 // download sub-images of the cadastre scan and join them into one single
                 Main.worker.execute(this);
@@ -90 +94 @@
         boolean loadedFromCache = downloadWMSPlanImage.waitFinished();
         if (wmsLayer.images.size() == 1 && !loadedFromCache) {
+            mouseClickedTime = System.currentTimeMillis();
             Main.map.mapView.addMouseListener(this);
             if (Main.pref.getBoolean("cadastrewms.noImageCropping", false) == false)
@@ -95 +100 @@
             else
                 startGeoreferencing();
-        } else // action cancelled or image loaded from cache (and already georeferenced)
+        } else // action cancelled or image loaded from cache (and already georeferenced)
             Main.map.repaint();
     }
 
     public void mouseClicked(MouseEvent e) {
-        if (e.getX() == mousePrevious.getX() && e.getY() == mousePrevious.getY())
-            return; // double click filtered
+        if (System.currentTimeMillis() - mouseClickedTime < initialClickDelay) {
+            System.out.println("mouse click bounce detected");
+            return; // mouse click anti-bounce
+        }
         else
-            mousePrevious.setLocation(e.getX(), e.getY());
+            mouseClickedTime = System.currentTimeMillis();
         countMouseClicked++;
         EastNorth ea = Main.proj.latlon2eastNorth(Main.map.mapView.getLatLon(e.getX(), e.getY()));
-        System.out.println("clic:"+countMouseClicked+" ,"+ea);
+        System.out.println("clic:"+countMouseClicked+" ,"+ea+", mode:"+mode);
         // ignore clicks outside the image
         if (ea.east() < wmsLayer.images.get(0).min.east() || ea.east() > wmsLayer.images.get(0).max.east()
@@ -153 +160 @@
                         null, options, options[0]);
             if (ret == JOptionPane.OK_OPTION) {
-                mousePrevious.setLocation(0, 0);
+                mouseClickedTime = System.currentTimeMillis();
             } else
                 if (canceledOrRestartCurrAction("image cropping"))
@@ -192 +199 @@
                         null, options, options[0]);
             if (ret == JOptionPane.OK_OPTION) {
-                mousePrevious.setLocation(0, 0);
+                mouseClickedTime = System.currentTimeMillis();
             } else
                 if (canceledOrRestartCurrAction("georeferencing"))
@@ -257 +264 @@
         if (countMouseClicked == 1) number = "first";
         else number = "second";
-        pane.createDialog(Main.parent, tr("Set "+number+" Lambert coordinate")).setVisible(true);
+        pane.createDialog(Main.parent, tr("Set "+number+" Lambert coordinates")).setVisible(true);
         if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue())) {
             if (canceledOrRestartCurrAction("georeferencing"))