Changeset 17834 in josm

Timestamp:

2021-04-28T22:01:28+02:00 (3 years ago)

Author:

simon04

Message:

see #20813 - Add ImageDisplayTest.testLoadImageRunnablePerformance

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (3 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplayTest.java (modified) (2 diffs)

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

@@ -237 +237 @@
 
     /** The thread that reads the images. */
-    private class LoadImageRunnable implements Runnable, ImageObserver {
+    protected class LoadImageRunnable implements Runnable, ImageObserver {
 
         private final ImageEntry entry;
@@ -744 +744 @@
      */
     public void setImage(ImageEntry entry) {
+        LoadImageRunnable runnable = setImage0(entry);
+        if (runnable != null) {
+            new Thread(runnable, LoadImageRunnable.class.getName()).start();
+        }
+    }
+
+    protected LoadImageRunnable setImage0(ImageEntry entry) {
         synchronized (this) {
             this.oldEntry = this.entry;
@@ -755 +762 @@
         }
         repaint();
-        if (entry != null) {
-            new Thread(new LoadImageRunnable(entry), LoadImageRunnable.class.getName()).start();
-        }
+        return entry != null ? new LoadImageRunnable(entry) : null;
     }
 

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplayTest.java

@@ -5 +5 @@
 
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.gui.layer.geoimage.ImageDisplay.VisRect;
+import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -43 +51 @@
                 ImageDisplay.calculateDrawImageRectangle(new VisRect(0, 0, 10, 5), new Dimension(8, 6)));
     }
+
+    /**
+     * Performance test for {@link ImageDisplay.LoadImageRunnable}
+     * @throws Exception if any error occurs
+     */
+    @Test
+    @Disabled("Set working directory to image folder and run manually")
+    void testLoadImageRunnablePerformance() throws Exception {
+        ImageDisplay imageDisplay = new ImageDisplay(new ImageryFilterSettings());
+        imageDisplay.setSize(640, 480);
+        Graphics2D graphics = new BufferedImage(640, 480, BufferedImage.TYPE_INT_RGB).createGraphics();
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(Paths.get(".").toAbsolutePath(), "*.{JPG,jpg}")) {
+            for (Path p : stream) {
+                Runnable loadImage = imageDisplay.setImage0(new ImageEntry(p.toFile()));
+                loadImage.run();
+                imageDisplay.paintComponent(graphics);
+            }
+        }
+    }
 }