Changeset 8723 in josm for trunk/src

Timestamp:

2015-09-03T16:57:32+02:00 (9 years ago)

Author:

simon04

Message:

see #11713 - use new interface ImageProcessor where applicable

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/layer/ImageryLayer.java (modified) (5 diffs)
• tools/ImageOverlay.java (modified) (3 diffs)
• tools/ImageResource.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -208 +208 @@
             tile.setImage(null);
         }
-        if (sharpenLevel != 0 && success) {
-            tile.setImage(sharpenImage(tile.getImage()));
-        }
         tile.setLoaded(success);
         needRedraw = true;

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -75 +75 @@
     protected double dy = 0.0;
 
-    protected int sharpenLevel;
-
     private final ImageryAdjustAction adjustAction = new ImageryAdjustAction(this);
 
@@ -93 +91 @@
             icon = ImageProvider.get("imagery_small");
         }
-        this.sharpenLevel = PROP_SHARPEN_LEVEL.get();
+        addImageProcessor(createSharpener(PROP_SHARPEN_LEVEL.get()));
     }
 
@@ -238 +236 @@
     }
 
-    public BufferedImage sharpenImage(BufferedImage img) {
-        if (sharpenLevel <= 0) return img;
-        int width = img.getWidth(null);
-        int height = img.getHeight(null);
-        BufferedImage tmp = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        tmp.getGraphics().drawImage(img, 0, 0, null);
-        Kernel kernel;
+    public ImageProcessor createSharpener(int sharpenLevel) {
+        final Kernel kernel;
         if (sharpenLevel == 1) {
-            kernel = new Kernel(3, 3, new float[] {-0.25f, -0.5f, -0.25f, -0.5f, 4, -0.5f, -0.25f, -0.5f, -0.25f});
+            kernel = new Kernel(3, 3, new float[]{-0.25f, -0.5f, -0.25f, -0.5f, 4, -0.5f, -0.25f, -0.5f, -0.25f});
+        } else if (sharpenLevel == 2) {
+            kernel = new Kernel(3, 3, new float[]{-0.5f, -1, -0.5f, -1, 7, -1, -0.5f, -1, -0.5f});
         } else {
-            kernel = new Kernel(3, 3, new float[] {-0.5f, -1, -0.5f, -1, 7, -1, -0.5f, -1, -0.5f});
+            return null;
         }
         BufferedImageOp op = new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null);
-        return op.filter(tmp, null);
-    }
-
-    /**
-     * This method adds the {@link ImageProcessor} to this Layer
+        return createImageProcessor(op, false);
+    }
+
+    /**
+     * This method adds the {@link ImageProcessor} to this Layer if it is not {@code null}.
      *
      * @param processor that processes the image
@@ -262 +257 @@
      */
     public boolean addImageProcessor(ImageProcessor processor) {
-        return imageProcessors.add(processor);
+        return processor != null && imageProcessors.add(processor);
     }
 
@@ -274 +269 @@
     public boolean removeImageProcessor(ImageProcessor processor) {
         return imageProcessors.remove(processor);
+    }
+
+    /**
+     * Wraps a {@link BufferedImageOp} to be used as {@link ImageProcessor}.
+     * @param op the {@link BufferedImageOp}
+     * @param inPlace true to apply filter in place, i.e., not create a new {@link BufferedImage} for the result
+     *                (the {@code op} needs to support this!)
+     * @return the {@link ImageProcessor} wrapper
+     */
+    public static ImageProcessor createImageProcessor(final BufferedImageOp op, final boolean inPlace) {
+        return new ImageProcessor() {
+            @Override
+            public BufferedImage process(BufferedImage image) {
+                return op.filter(image, inPlace ? image : null);
+            }
+        };
     }
 

trunk/src/org/openstreetmap/josm/tools/ImageOverlay.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools;
+
+import org.openstreetmap.josm.gui.layer.ImageProcessor;
 
 import java.awt.Dimension;
@@ -10 +12 @@
  * @since 8095
  */
-public class ImageOverlay {
+public class ImageOverlay implements ImageProcessor {
     /** the image resource to use as overlay */
     public ImageProvider image;
@@ -65 +67 @@
      * @since 8095
      */
-    public BufferedImage apply(BufferedImage ground) {
+    @Override
+    public BufferedImage process(BufferedImage ground) {
         /* get base dimensions for calculation */
         int w = ground.getWidth();

trunk/src/org/openstreetmap/josm/tools/ImageResource.java

@@ -115 +115 @@
             if (overlayInfo != null) {
                 for (ImageOverlay o : overlayInfo) {
-                    o.apply(bimg);
+                    o.process(bimg);
                 }
             }
@@ -139 +139 @@
             if (overlayInfo != null) {
                 for (ImageOverlay o : overlayInfo) {
-                    o.apply(bimg);
+                    o.process(bimg);
                 }
             }