Changeset 17740 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

Timestamp:

2021-04-11T11:29:10+02:00 (3 years ago)

Author:

simon04

Message:

fix #20659 - Add contrast/gamma/... on image viewer

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (10 diffs)

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
+import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
+import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings.FilterChangeListener;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -37 +39 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ExifReader;
+import org.openstreetmap.josm.tools.ImageProcessor;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -45 +48 @@
  * Offers basic mouse interaction (zoom, drag) and on-screen text.
  */
-public class ImageDisplay extends JComponent implements Destroyable, PreferenceChangedListener {
+public class ImageDisplay extends JComponent implements Destroyable, PreferenceChangedListener, FilterChangeListener {
 
     /** The file that is currently displayed */
@@ -51 +54 @@
 
     /** The image currently displayed */
-    private transient Image image;
+    private transient BufferedImage image;
+
+    /**
+     * Process the image before it is being displayed
+     */
+    private final ImageProcessor imageProcessor;
 
     /** The image currently displayed */
@@ -295 +303 @@
         @Override
         public void run() {
-            Image img;
+            BufferedImage img;
             try {
                 img = ImageIO.read(file);
@@ -690 +698 @@
      */
     public ImageDisplay() {
+        this(image -> image);
+    }
+
+    public ImageDisplay(ImageProcessor imageProcessor) {
         addMouseListener(imgMouseListener);
         addMouseWheelListener(imgMouseListener);
@@ -695 +707 @@
         Config.getPref().addPreferenceChangeListener(this);
         preferenceChanged(null);
+        this.imageProcessor = imageProcessor;
+        if (imageProcessor instanceof ImageryFilterSettings) {
+            ((ImageryFilterSettings) imageProcessor).addFilterChangeListener(this);
+        }
     }
 
@@ -703 +719 @@
         removeMouseMotionListener(imgMouseListener);
         Config.getPref().removePreferenceChangeListener(this);
+        if (imageProcessor instanceof ImageryFilterSettings) {
+            ((ImageryFilterSettings) imageProcessor).removeFilterChangeListener(this);
+        }
     }
 
@@ -744 +763 @@
 
     @Override
+    public void filterChanged() {
+        repaint();
+    }
+
+    @Override
     public void paintComponent(Graphics g) {
         ImageEntry entry;
-        Image image;
+        BufferedImage image;
         VisRect visibleRect;
         boolean errorLoading;
@@ -818 +842 @@
                     r.x = r.y = 0;
                 }
+            }
+
+            if (image != null) {
+                image = imageProcessor.process(image);
             }