Changeset 18150 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2021-08-21T03:19:58+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20799 - fix performance/memory issues while scrolling across many geolocated images

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/geoimage/ImageDisplay.java (modified) (2 diffs)
• layer/geoimage/ImageViewerDialog.java (modified) (5 diffs)
• progress/swing/ProgressMonitorExecutor.java (modified) (1 diff)

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

@@ -22 +22 @@
 import java.io.IOException;
 import java.util.Objects;
+import java.util.concurrent.Future;
 
 import javax.swing.JComponent;
@@ -635 +636 @@
      * Sets a new source image to be displayed by this {@code ImageDisplay}.
      * @param entry new source image
-     * @since 13220
+     * @return a {@link Future} representing pending completion of the image loading task
+     * @since 18150
      */
-    public void setImage(ImageEntry entry) {
+    public Future<?> setImage(ImageEntry entry) {
         LoadImageRunnable runnable = setImage0(entry);
-        if (runnable != null) {
-            MainApplication.worker.execute(runnable);
-        }
+        return runnable != null ? MainApplication.worker.submit(runnable) : null;
     }
 

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

@@ -19 +19 @@
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.Future;
 
 import javax.swing.AbstractAction;
@@ -73 +74 @@
 
     private final ImageDisplay imgDisplay = new ImageDisplay(imageryFilterSettings);
+    private Future<?> imgLoadingFuture;
     private boolean centerView;
 
@@ -205 +207 @@
         imageRemoveFromDiskAction.destroy();
         imageZoomAction.destroy();
+        cancelLoadingImage();
         super.destroy();
         dialog = null;
@@ -467 +470 @@
 
             if (imageChanged) {
+                cancelLoadingImage();
                 // Set only if the image is new to preserve zoom and position if the same image is redisplayed
                 // (e.g. to update the OSD).
-                imgDisplay.setImage(entry);
+                imgLoadingFuture = imgDisplay.setImage(entry);
             }
             setTitle(tr("Geotagged Images") + (!entry.getDisplayName().isEmpty() ? " - " + entry.getDisplayName() : ""));
@@ -628 +632 @@
     }
 
+    private void cancelLoadingImage() {
+        if (imgLoadingFuture != null) {
+            imgLoadingFuture.cancel(false);
+            imgLoadingFuture = null;
+        }
+    }
+
     @Override
     public void selectedImageChanged(ImageData data) {

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

@@ -49 +49 @@
                 ((Future<?>) r).get();
             } catch (CancellationException cancellationException) {
-                t = cancellationException;
+                Logging.debug("Thread {0} raised {1}", Thread.currentThread().getName(), cancellationException);
             } catch (ExecutionException executionException) {
                 Logging.trace(executionException);