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

Timestamp:

2011-01-02T00:36:28+01:00 (14 years ago)

Author:

pieren

Message:

moved grab action to a thread

Location:

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

Files:

• CacheControl.java (modified) (2 diffs)
• DownloadWMSPlanImage.java (modified) (3 diffs)
• DownloadWMSVectorImage.java (modified) (2 diffs)
• GeorefImage.java (modified) (1 diff)
• GrabThread.java (added)
• MenuActionCancelGrab.java (added)
• MenuActionGrabPlanImage.java (modified) (5 diffs)
• MenuActionLoadFromCache.java (modified) (1 diff)
• MenuActionSaveRasterAs.java (modified) (1 diff)
• WMSAdjustAction.java (modified) (2 diffs)
• WMSLayer.java (modified) (15 diffs)

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

@@ -153 +153 @@
         if (successfulRead && wmsLayer.isRaster()) {
             // serialized raster bufferedImage hangs-up on Java6. Recreate them here
-            wmsLayer.images.get(0).image = RasterImageModifier.fixRasterImage(wmsLayer.images.get(0).image);
+            wmsLayer.getImage(0).image = RasterImageModifier.fixRasterImage(wmsLayer.getImage(0).image);
         }
         return successfulRead;
@@ -172 +172 @@
         for (;;) {
             imagesLock.lock();
-            //ArrayList<GeorefImage> images = new ArrayList<GeorefImage>(imagesToSave);
             int size = imagesToSave.size();
             imagesLock.unlock();

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

@@ -35 +35 @@
             try {
                 if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
-                    if (!wmsLayer.images.isEmpty()) {
+                    if (!wmsLayer.getImages().isEmpty()) {
                         //JOptionPane.showMessageDialog(Main.parent,tr("Image already loaded"));
                         JOptionPane pane = new JOptionPane(
@@ -51 +51 @@
                         // first time we grab an image for this layer
                         if (CacheControl.cacheEnabled) {
-                            if (wmsLayer.getCacheControl().loadCacheIfExist()) {
+                            if (wmsLayer.grabThread.getCacheControl().loadCacheIfExist()) {
                                 dontGeoreference = true;
                                 Main.map.mapView.repaint();
@@ -64 +64 @@
                             wmsLayer.grab(grabber, bounds);
                             if (grabber.getWmsInterface().downloadCancelled) {
-                                wmsLayer.images.clear();
+                                wmsLayer.clearImages();
                                 Main.map.mapView.repaint();
                             } else {

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

@@ -33 +33 @@
         try {
             if (grabber.getWmsInterface().retrieveInterface(wmsLayer)) {
-                if (wmsLayer.images.isEmpty()) {
+                if (wmsLayer.getImages().isEmpty()) {
                     // first time we grab an image for this layer
                     if (CacheControl.cacheEnabled) {
-                        if (wmsLayer.getCacheControl().loadCacheIfExist()) {
+                        if (wmsLayer.grabThread.getCacheControl().loadCacheIfExist()) {
                             Main.map.mapView.zoomTo(wmsLayer.getCommuneBBox().toBounds());
                             //Main.map.mapView.repaint();
@@ -69 +69 @@
         grabber.getWmsInterface().cancel();
         if (wmsLayer != null)
-            wmsLayer.cancelled = true;
+            wmsLayer.grabThread.setCancelled(true);
     }
 

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

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 
-public class GeorefImage implements Serializable, ImageObserver {
+public class GeorefImage implements Serializable, ImageObserver, Cloneable {
     private static final long serialVersionUID = 1L;
 

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

@@ -106 +106 @@
         if (loadedFromCache) {
             Main.map.repaint();
-        } else if (wmsLayer.images.size() == 0) {
+        } else if (wmsLayer.getImages().size() == 0) {
             // action cancelled or image loaded from cache (and already georeferenced)
             actionInterrupted();
@@ -149 +149 @@
             countMouseClicked++;
             // ignore clicks outside the image
-            if (ea.east() < wmsLayer.images.get(0).min.east() || ea.east() > wmsLayer.images.get(0).max.east()
-                    || ea.north() < wmsLayer.images.get(0).min.north() || ea.north() > wmsLayer.images.get(0).max.north())
+            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())
                 return;
             if (mode == cGetCorners) {
@@ -259 +259 @@
         Main.map.mapView.removeMouseListener(this);
         affineTransform(ea1, ea2, georefpoint1, georefpoint2);
-        wmsLayer.saveNewCache();
+        wmsLayer.grabThread.saveNewCache();
         Main.map.mapView.repaint();
         actionCompleted();
@@ -378 +378 @@
         double dx = dst1.getX() - org1.getX();
         double dy = dst1.getY() - org1.getY();
-        wmsLayer.images.get(0).shear(dx, dy);
+        wmsLayer.getImage(0).shear(dx, dy);
         org1 = org1.add(dx, dy); // org1=dst1 now
         org2 = org2.add(dx, dy);
         // rotate : org1(=dst1 now) is anchor for rotation and scale
-        wmsLayer.images.get(0).rotate(dst1, angle);
+        wmsLayer.getImage(0).rotate(dst1, angle);
         org2 = org2.rotate(dst1, angle);
         // scale image from anchor org1(=dst1 now)
-        wmsLayer.images.get(0).scale(dst1, proportion);
+        wmsLayer.getImage(0).scale(dst1, proportion);
     }
 
@@ -392 +392 @@
         georefpoint2 = new EastNorth(wmsLayer.X0+wmsLayer.fX*wmsLayer.communeBBox.max.getX(),
                 wmsLayer.Y0+wmsLayer.fY*wmsLayer.communeBBox.max.getX());
-        ea1 = new EastNorth(wmsLayer.images.get(0).min.east(), wmsLayer.images.get(0).max.north());
-        EastNorth ea2 = wmsLayer.images.get(0).max;
+        ea1 = new EastNorth(wmsLayer.getImage(0).min.east(), wmsLayer.getImage(0).max.north());
+        EastNorth ea2 = wmsLayer.getImage(0).max;
         affineTransform(ea1, ea2, georefpoint1, georefpoint2);
-        wmsLayer.saveNewCache();
+        wmsLayer.grabThread.saveNewCache();
         Main.map.mapView.repaint();
     }

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

@@ -75 +75 @@
                     // create layer and load cache
                     WMSLayer wmsLayer = new WMSLayer("", "", Integer.parseInt(ext)-1);
-                    if (wmsLayer.getCacheControl().loadCache(file, layoutZone)) {
+                    if (wmsLayer.grabThread.getCacheControl().loadCache(file, layoutZone)) {
                         CadastrePlugin.addWMSLayer(wmsLayer);
                     }

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

@@ -56 +56 @@
             if (!file.getName().endsWith(".png"))
                 file = new File(file.getParent(), file.getName()+".png");
-            BufferedImage bi = wmsLayer.images.get(0).image; 
+            BufferedImage bi = wmsLayer.getImage(0).image; 
             try {
                 ImageIO.write(bi, "png", file);

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

@@ -165 +165 @@
             double endAngle = Math.atan2(end.east()-pivot.east(), end.north()-pivot.north());
             double rotationAngle = endAngle - startAngle;
-            if (selectedLayer.images.get(0).orgCroppedRaster != null) {
+            if (selectedLayer.getImage(0).orgCroppedRaster != null) {
                 for (int i=0; i<4; i++) {
-                    croppedRaster[i] = selectedLayer.images.get(0).orgCroppedRaster[i].rotate(pivot, rotationAngle);
+                    croppedRaster[i] = selectedLayer.getImage(0).orgCroppedRaster[i].rotate(pivot, rotationAngle);
                 }
                 croppedRaster[4] = croppedRaster[0];
@@ -198 +198 @@
     private void saveModifiedLayers() {
         for (WMSLayer wmsLayer : modifiedLayers) {
-            wmsLayer.saveNewCache();
+            wmsLayer.grabThread.saveNewCache();
         }
     }

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

@@ -20 +20 @@
 import java.util.HashSet;
 import java.util.Vector;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import javax.swing.Action;
@@ -34 +36 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.io.OsmTransferException;
 
 /**
@@ -48 +49 @@
             CadastrePlugin.class.getResource("/images/cadastre_small.png")));
 
-    protected Vector<GeorefImage> images = new Vector<GeorefImage>();
+    private Vector<GeorefImage> images = new Vector<GeorefImage>();
+
+    public Lock imagesLock = new ReentrantLock();
 
     /**
@@ -61 +64 @@
     private ArrayList<EastNorthBound> dividedBbox = new ArrayList<EastNorthBound>();
 
-    private CacheControl cacheControl = null;
-
     private String location = "";
 
@@ -70 +71 @@
 
     public EastNorthBound communeBBox = new EastNorthBound(new EastNorth(0,0), new EastNorth(0,0));
-
-    public boolean cancelled;
 
     private boolean isRaster = false;
@@ -84 +83 @@
     private Action saveAsPng;
 
+    private Action cancelGrab;
+
     public boolean adjustModeEnabled;
 
-
+    public GrabThread grabThread;
+    
     public WMSLayer() {
         this(tr("Blank Layer"), "", -1);
@@ -96 +98 @@
         this.codeCommune = codeCommune;
         this.lambertZone = lambertZone;
+        grabThread = new GrabThread(this);
+        grabThread.start();
         // enable auto-sourcing option
         CadastrePlugin.pluginUsed = true;
@@ -103 +107 @@
     public void destroy() {
         // if the layer is currently saving the images in the cache, wait until it's finished
-        if (cacheControl != null) {
-            while (!cacheControl.isCachePipeEmpty()) {
-                System.out.println("Try to close a WMSLayer which is currently saving in cache : wait 1 sec.");
-                CadastrePlugin.safeSleep(1000);
-            }
-        }
+        grabThread.cancel();
         super.destroy();
         images = null;
@@ -127 +126 @@
 
     public void grab(CadastreGrabber grabber, Bounds b) throws IOException {
-        cancelled = false;
+        grabThread.setCancelled(false);
+        grabThread.setGrabber(grabber);
         // if it is the first layer, use the communeBBox as grab bbox (and not divided)
         if (Main.map.mapView.getAllLayers().size() == 1 ) {
@@ -142 +142 @@
         }
 
-        int lastSavedImage = images.size();
-        for (EastNorthBound n : dividedBbox) {
-            if (cancelled)
-                return;
-            GeorefImage newImage;
-            try {
-                newImage = grabber.grab(this, n.min, n.max);
-            } catch (IOException e) {
-                System.out.println("Download action cancelled by user or server did not respond");
-                break;
-            } catch (OsmTransferException e) {
-                System.out.println("OSM transfer failed");
-                break;
-            }
-            if (grabber.getWmsInterface().downloadCancelled) {
-                System.out.println("Download action cancelled by user");
-                break;
-            }
-            if (CadastrePlugin.backgroundTransparent) {
-                for (GeorefImage img : images) {
-                    if (img.overlap(newImage))
-                        // mask overlapping zone in already grabbed image
-                        img.withdraw(newImage);
-                    else
-                        // mask overlapping zone in new image only when new
-                        // image covers completely the existing image
-                        newImage.withdraw(img);
-                }
-            }
-            images.add(newImage);
-            Main.map.mapView.repaint();
-        }
-        if (!cancelled) {
-            for (int i=lastSavedImage; i < images.size(); i++)
-                saveToCache(images.get(i));
-        }
+        grabThread.addImages(dividedBbox);
+        Main.map.repaint();
     }
 
@@ -255 +221 @@
             else
                 g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
-            synchronized(this){
-                for (GeorefImage img : images)
-                    img.paint(g, mv, CadastrePlugin.backgroundTransparent,
-                            CadastrePlugin.transparency, CadastrePlugin.drawBoundaries);
-            }
+            imagesLock.lock();
+            for (GeorefImage img : images)
+                img.paint(g, mv, CadastrePlugin.backgroundTransparent,
+                        CadastrePlugin.transparency, CadastrePlugin.drawBoundaries);
+            imagesLock.unlock();
             g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, savedInterpolation);
         }
         if (this.isRaster) {
             paintCrosspieces(g, mv);
+        }
+        if (grabThread.getImagesToGrabSize() > 0) {
+            grabThread.paintBoxesToGrab(g, mv);
         }
         if (this.adjustModeEnabled) {
@@ -287 +256 @@
         saveAsPng = new MenuActionSaveRasterAs(this);
         saveAsPng.setEnabled(isRaster);
+        cancelGrab = new MenuActionCancelGrab(this);
+        cancelGrab.setEnabled(!isRaster && grabThread.getImagesToGrabSize() > 0);
         return new Action[] {
                 LayerListDialog.getInstance().createShowHideLayerAction(),
@@ -292 +263 @@
                 new MenuActionLoadFromCache(),
                 saveAsPng,
+                cancelGrab,
                 new LayerListPopup.InfoAction(this),
 
@@ -318 +290 @@
         }
         return false;
-    }
-
-    public void saveToCache(GeorefImage image) {
-        if (CacheControl.cacheEnabled && !isRaster()) {
-            getCacheControl().saveCache(image);
-        }
-    }
-
-    public void saveNewCache() {
-        if (CacheControl.cacheEnabled) {
-            getCacheControl().deleteCacheFile();
-            for (GeorefImage image : images)
-                getCacheControl().saveCache(image);
-        }
-    }
-
-    public CacheControl getCacheControl() {
-        if (cacheControl == null)
-            cacheControl = new CacheControl(this);
-        return cacheControl;
     }
 
@@ -642 +594 @@
     }
 
+    public GeorefImage getImage(int index) {
+        imagesLock.lock();
+        GeorefImage img = null;
+        try {
+            img = this.images.get(index);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            e.printStackTrace(System.out);
+        }
+        imagesLock.unlock();
+        return img;
+    }
+    
+    public Vector<GeorefImage> getImages() {
+        return this.images;
+    }
+    
+    public void addImage(GeorefImage img) {
+        imagesLock.lock();
+        this.images.add(img);
+        imagesLock.unlock();
+    }
+    
+    public void setImages(Vector<GeorefImage> images) {
+        imagesLock.lock();
+        this.images = images;
+        imagesLock.unlock();
+    }
+    
+    public void clearImages() {
+        imagesLock.lock();
+        this.images.clear();
+        imagesLock.unlock();
+    }
+
 }