Changeset 7935 in josm for trunk/src

Timestamp:

2015-01-07T21:01:44+01:00 (10 years ago)

Author:

bastiK

Message:

applied #10920, applied #10854 - Move 'Toggle image thumbnail preview' feature to JOSM core (patch by holgermappt, modified)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• layer/geoimage/GeoImageLayer.java (modified) (10 diffs)
• layer/geoimage/ShowThumbnailAction.java (added)
• layer/geoimage/ThumbsLoader.java (modified) (2 diffs)
• progress/ProgressMonitorExecutor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -728 +728 @@
 
                     yLayer.useThumbs = cbShowThumbs.isSelected();
-                    yLayer.loadThumbs();
+                    yLayer.startLoadThumbs();
 
                     // Search whether an other layer has yet defined some bounding box.

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -18 +18 @@
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.StringSelection;
-import java.awt.Toolkit;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -38 +35 @@
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import javax.swing.Action;
@@ -78 +77 @@
 import com.drew.metadata.exif.ExifIFD0Directory;
 import com.drew.metadata.exif.GpsDirectory;
+import java.util.concurrent.ThreadFactory;
 
 /**
@@ -93 +93 @@
 
     boolean useThumbs = false;
+    ExecutorService thumbusLoaderExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+        @Override
+        public Thread newThread(Runnable r) {
+            Thread t = new Thread(r);
+            t.setPriority(Thread.MIN_PRIORITY);
+            return t;
+        }
+    });
     ThumbsLoader thumbsloader;
-    boolean thumbsLoaded = false;
+    boolean thumbsLoaderRunning = false;
+    volatile boolean thumbsLoaded = false;
     private BufferedImage offscreenBuffer;
     boolean updateOffscreenBuffer = true;
@@ -331 +340 @@
         entries.add(SeparatorLayerAction.INSTANCE);
         entries.add(new CorrelateGpxWithImages(this));
+        entries.add(new ShowThumbnailAction(this));
         if (!menuAdditions.isEmpty()) {
             entries.add(SeparatorLayerAction.INSTANCE);
@@ -372 +382 @@
     public void mergeFrom(Layer from) {
         GeoImageLayer l = (GeoImageLayer) from;
+
+        // Stop to load thumbnails on both layers.  Thumbnail loading will continue the next time
+        // the layer is painted.
+        stopLoadThumbs();
+        l.stopLoadThumbs();
 
         ImageEntry selected = null;
@@ -440 +455 @@
         if (useThumbs) {
             if (!thumbsLoaded) {
-                loadThumbs();
+                startLoadThumbs();
             }
 
@@ -989 +1004 @@
             public void layerRemoved(Layer oldLayer) {
                 if (oldLayer == GeoImageLayer.this) {
-                    if (thumbsloader != null) {
-                        thumbsloader.stop = true;
-                    }
+                    stopLoadThumbs();
                     Main.map.mapView.removeMouseListener(mouseAdapter);
                     MapFrame.removeMapModeChangeListener(mapModeListener);
@@ -1017 +1030 @@
     }
 
-    public void loadThumbs() {
-        if (useThumbs && !thumbsLoaded) {
-            thumbsLoaded = true;
+    /**
+     * Start to load thumbnails.
+     */
+    public synchronized void startLoadThumbs() {
+        if (useThumbs && !thumbsLoaded && !thumbsLoaderRunning) {
+            stopLoadThumbs();
             thumbsloader = new ThumbsLoader(this);
-            Thread t = new Thread(thumbsloader);
-            t.setPriority(Thread.MIN_PRIORITY);
-            t.start();
-        }
+            thumbusLoaderExecutor.submit(thumbsloader);
+            thumbsLoaderRunning = true;
+        }
+    }
+
+    /**
+     * Stop to load thumbnails.
+     * 
+     * Can be called at any time to make sure that the
+     * thumbnail loader is stopped.
+     */
+    public synchronized void stopLoadThumbs() {
+        if (thumbsloader != null) {
+            thumbsloader.stop = true;
+        }
+        thumbsLoaderRunning = false;
+    }
+
+    /**
+     * Called to signal that the loading of thumbnails has finished.
+     * 
+     * Usually called from {@link ThumbsLoader} in another thread.
+     */
+    public void thumbsLoaded() {
+        thumbsLoaded = true;
     }
 
@@ -1076 +1113 @@
         this.useThumbs = useThumbs;
         if (useThumbs && !thumbsLoaded) {
-            loadThumbs();
+            startLoadThumbs();
+        } else if (!useThumbs) {
+            stopLoadThumbs();
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -17 +17 @@
     public static final int maxSize = 120;
     public static final int minSize = 22;
-    volatile boolean stop = false;
+    public volatile boolean stop = false;
     List<ImageEntry> data;
     GeoImageLayer layer;
@@ -51 +51 @@
             }
         }
+        layer.thumbsLoaded();
         layer.updateOffscreenBuffer = true;
         Main.map.mapView.repaint();

trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitorExecutor.java

@@ -8 +8 @@
 import org.openstreetmap.josm.Main;
 
+/**
+ * Executor that displays the progress monitor to the user.
+ * 
+ * Similar to Executors.newSingleThreadExecutor(), but displays the
+ * progress monitor whenever a new task is executed.
+ */
 public class ProgressMonitorExecutor extends ThreadPoolExecutor {