Changeset 8625 in josm for trunk

Timestamp:

2015-07-27T16:45:58+02:00 (9 years ago)

Author:

bastiK

Message:

applied #11713 - JOSM raster layers filters plugin development (patch by Nipel-Crumple, slightly modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/MapView.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (2 diffs)
• gui/layer/ImageProcessor.java (added)
• gui/layer/ImageryLayer.java (modified) (3 diffs)
• gui/layer/Layer.java (modified) (3 diffs)
• io/session/SessionWriter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -1152 +1152 @@
         if (evt.getPropertyName().equals(Layer.VISIBLE_PROP)) {
             repaint();
-        } else if (evt.getPropertyName().equals(Layer.OPACITY_PROP)) {
+        } else if (evt.getPropertyName().equals(Layer.OPACITY_PROP) ||
+                evt.getPropertyName().equals(Layer.FILTER_STATE_PROP)) {
             Layer l = (Layer) evt.getSource();
             if (l.isVisible()) {

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

@@ -17 +17 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.image.BufferedImage;
 import java.awt.image.ImageObserver;
 import java.io.File;
@@ -1017 +1018 @@
                 continue;
             }
+
+            // applying all filters to this layer
+            img = applyImageProcessors((BufferedImage) img);
+
             Rectangle sourceRect = tileToRect(tile);
             if (borderRect != null && !sourceRect.intersects(borderRect)) {

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

@@ -22 +22 @@
 import java.text.AttributedCharacterIterator;
 import java.text.AttributedString;
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
@@ -55 +56 @@
     public static final IntegerProperty PROP_FADE_AMOUNT = new IntegerProperty("imagery.fade_amount", 0);
     public static final IntegerProperty PROP_SHARPEN_LEVEL = new IntegerProperty("imagery.sharpen_level", 0);
+
+    private final List<ImageProcessor> imageProcessors = new ArrayList<>();
 
     public static Color getFadeColor() {
@@ -249 +252 @@
         BufferedImageOp op = new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null);
         return op.filter(tmp, null);
+    }
+
+    /**
+     * This method adds the {@link ImageProcessor} to this Layer
+     *
+     * @param processor that processes the image
+     *
+     * @return true if processor was added, false otherwise
+     */
+    public boolean addImageProcessor(ImageProcessor processor) {
+        return imageProcessors.add(processor);
+    }
+
+    /**
+     * This method removes given {@link ImageProcessor} from this layer
+     *
+     * @param processor which is needed to be removed
+     *
+     * @return true if processor was removed
+     */
+    public boolean removeImageProcessor(ImageProcessor processor) {
+        return imageProcessors.remove(processor);
+    }
+
+    /**
+     * This method gets all {@link ImageProcessor}s of the layer
+     *
+     * @return list of image processors without removed one
+     */
+    public List<ImageProcessor> getImageProcessors() {
+        return imageProcessors;
+    }
+
+    /**
+     * Applies all the chosen {@link ImageProcessor}s to the image
+     *
+     * @param img - image which should be changed
+     *
+     * @return the new changed image
+     */
+    public BufferedImage applyImageProcessors(BufferedImage img) {
+        for (ImageProcessor processor : imageProcessors) {
+            img = processor.process(img);
+        }
+        return img;
     }
 

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

@@ -86 +86 @@
     public static final String OPACITY_PROP = Layer.class.getName() + ".opacity";
     public static final String NAME_PROP = Layer.class.getName() + ".name";
+    public static final String FILTER_STATE_PROP = Layer.class.getName() + ".filterstate";
 
     public static final int ICON_SIZE = 16;
@@ -314 +315 @@
 
     /**
+     * Sets new state to the layer after applying {@link ImageProcessor}.
+     */
+    public void setFilterStateChanged() {
+        fireFilterStateChanged();
+    }
+
+    /**
      * Toggles the visibility state of this layer.
      */
@@ -356 +364 @@
     protected void fireOpacityChanged(double oldValue, double newValue) {
         propertyChangeSupport.firePropertyChange(OPACITY_PROP, oldValue, newValue);
+    }
+
+    /**
+     * fires a property change for the property {@link #FILTER_STATE_PROP}.
+     */
+    protected void fireFilterStateChanged() {
+        propertyChangeSupport.firePropertyChange(FILTER_STATE_PROP, null, null);
     }
 

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -64 +64 @@
      * Register a session layer exporter.
      *
-     * The exporter class must have an one-argument constructor with layerClass as formal parameter type.
+     * The exporter class must have a one-argument constructor with layerClass as formal parameter type.
      */
     public static void registerSessionLayerExporter(Class<? extends Layer> layerClass, Class<? extends SessionLayerExporter> exporter) {
@@ -93 +93 @@
      * Constructs a new {@code SessionWriter}.
      * @param layers The ordered list of layers to save
-     * @param active The index of active layer in {@code layers} (starts to 0). Ignored if set to -1
+     * @param active The index of active layer in {@code layers} (starts at 0). Ignored if set to -1
      * @param exporters The exporters to use to save layers
      * @param zip {@code true} if a joz archive has to be created, {@code false otherwise}