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

Timestamp:

2011-01-12T23:33:13+01:00 (15 years ago)

Author:

pieren

Message:

change the way we grab the small squares with a spiral algorithm to visualize the first square in the middle of the screen

File:

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

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

@@ -22 +22 @@
     private WMSLayer wmsLayer;
 
-    private Lock lock = new ReentrantLock();
+    private Lock lockImagesToGrag = new ReentrantLock();
 
     private ArrayList<EastNorthBound> imagesToGrab = new ArrayList<EastNorthBound>();
@@ -30 +30 @@
     private EastNorthBound currentGrabImage;
 
+    private Lock lockCurrentGrabImage = new ReentrantLock();
+
+    /**
+     * Call directly grabber for raster images or prepare thread for vector images 
+     * @param moreImages
+     */
     public void addImages(ArrayList<EastNorthBound> moreImages) {
-        lock.lock();
+        lockImagesToGrag.lock();
         imagesToGrab.addAll(moreImages);
-        lock.unlock();
+        lockImagesToGrag.unlock();
         synchronized(this) {
             this.notify();
         }
         System.out.println("Added " + moreImages.size() + " to the grab thread");
+        if (wmsLayer.isRaster()) {
+            waitNotification();
+        }
     }
 
     public int getImagesToGrabSize() {
-        lock.lock();
+        lockImagesToGrag.lock();
         int size = imagesToGrab.size();
-        lock.unlock();
+        lockImagesToGrag.unlock();
         return size;
     }
@@ -49 +58 @@
     public ArrayList<EastNorthBound> getImagesToGrabCopy() {
         ArrayList<EastNorthBound> copyList = new ArrayList<EastNorthBound>(); 
-        lock.lock();
+        lockImagesToGrag.lock();
         for (EastNorthBound img : imagesToGrab) {
             EastNorthBound imgCpy = new EastNorthBound(img.min, img.max);
             copyList.add(imgCpy);
         }
-        lock.unlock();
+        lockImagesToGrag.unlock();
         return copyList;
     }
     
     public void clearImagesToGrab() {        
-        lock.lock();
+        lockImagesToGrag.lock();
         imagesToGrab.clear();
-        lock.unlock();
+        lockImagesToGrag.unlock();
     }
     
@@ -68 +77 @@
         for (;;) {
             while (getImagesToGrabSize() > 0) {
-                lock.lock();
+                lockImagesToGrag.lock();
+                lockCurrentGrabImage.lock();
                 currentGrabImage = imagesToGrab.get(0);
+                lockCurrentGrabImage.unlock();
                 imagesToGrab.remove(0);
-                lock.unlock();
+                lockImagesToGrag.unlock();
                 if (cancelled) {
                     break;
@@ -77 +88 @@
                     GeorefImage newImage;
                     try {
+                        Main.map.repaint(); // paint the current grab box
                         newImage = grabber.grab(wmsLayer, currentGrabImage.min, currentGrabImage.max);
                     } catch (IOException e) {
@@ -93 +105 @@
                         break;
                     }
+                    try {
                     if (CadastrePlugin.backgroundTransparent) {
                         wmsLayer.imagesLock.lock();
@@ -109 +122 @@
                     Main.map.mapView.repaint();
                     saveToCache(newImage);
+                    } catch (NullPointerException e) {
+                        System.out.println("Layer destroyed. Cancel grab thread");
+                        setCancelled(true);
+                    }
                 }
             }
             System.out.println("grab thread list empty");
+            lockCurrentGrabImage.lock();
             currentGrabImage = null;
+            lockCurrentGrabImage.unlock();
             if (cancelled) {
                 clearImagesToGrab();
                 cancelled = false;
             }
-            synchronized(this) {
-                try {
-                    wait();
-                } catch (InterruptedException e) {
-                    e.printStackTrace(System.out);
-                }
-            }
-        }
+            if (wmsLayer.isRaster()) {
+                notifyWaiter();
+            }
+            waitNotification();        }
     }
 
@@ -165 +180 @@
 
     public void paintBoxesToGrab(Graphics g, MapView mv) {
-        ArrayList<EastNorthBound> imagesToGrab = getImagesToGrabCopy();
-        for (EastNorthBound img : imagesToGrab) {
-            paintBox(g, mv, img, Color.red);
-        }
+        if (getImagesToGrabSize() > 0) {
+            ArrayList<EastNorthBound> imagesToGrab = getImagesToGrabCopy();
+            for (EastNorthBound img : imagesToGrab) {
+                paintBox(g, mv, img, Color.red);
+            }
+        }
+        lockCurrentGrabImage.lock();
         if (currentGrabImage != null) {
             paintBox(g, mv, currentGrabImage, Color.orange);
         }
+        lockCurrentGrabImage.unlock();
     }
     
@@ -203 +222 @@
     }
 
+    private synchronized void notifyWaiter() {
+        this.notify();
+    }
+
+    private synchronized void waitNotification() {
+        try {
+            wait();
+        } catch (InterruptedException e) {
+            e.printStackTrace(System.out);
+        }
+    }
+
 }