Changeset 13652 in osm for applications/editors/josm

Timestamp:

2009-02-10T20:57:50+01:00 (16 years ago)

Author:

hampelratte

Message:

added menu item to toggle the alpha channel of the wms images

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• GeorefImage.java (modified) (4 diffs)
• WMSLayer.java (modified) (9 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java

@@ -3 +3 @@
 import java.awt.Dimension;
 import java.awt.Graphics;
+import java.awt.Image;
 import java.awt.Point;
+import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
+import java.awt.image.FilteredImageSource;
+import java.awt.image.ImageProducer;
+import java.awt.image.RGBImageFilter;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -12 +17 @@
 import javax.imageio.ImageIO;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -69 +75 @@
         }
 
+        boolean alphaChannel = Main.pref.getBoolean("wmsplugin.alpha_channel");
+        Image ppImg = image;
+        if(!alphaChannel) {
+            // set alpha value to 255
+            ppImg = clearAlpha(image);
+        }
+           
         // We haven't got a saved resized copy, so resize and cache it        
-        reImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        reImg.getGraphics().drawImage(image,
+        reImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+        reImg.getGraphics().drawImage(ppImg,
             0, 0, width, height, // dest
-            0, 0, image.getWidth(), image.getHeight(), // src
+            0, 0, ppImg.getWidth(null), ppImg.getHeight(null), // src
             null);
 
@@ -95 +108 @@
             ImageIO.write(image, "png", ImageIO.createImageOutputStream(out));
     }
+
+    private Image clearAlpha(Image img) {
+                ImageProducer ip = img.getSource();
+                RGBImageFilter filter = new RGBImageFilter() {
+                        public int filterRGB(int x, int y, int rgb) {
+                                return rgb | 0xff000000;
+                        }
+                };
+                ImageProducer filt_ip = new FilteredImageSource(ip, filter);
+                Image out_img = Toolkit.getDefaultToolkit().createImage(filt_ip);
+
+                return out_img;
+        }
 }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.lang.Math;
 import java.awt.Component;
 import java.awt.Graphics;
@@ -13 +12 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JFileChooser;
-import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -26 +27 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.MapView;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -61 +59 @@
     protected GeorefImage[][] images = new GeorefImage[dax][day];
     JCheckBoxMenuItem startstop = new JCheckBoxMenuItem(tr("Automatic downloading"), true);
-
+    protected JCheckBoxMenuItem alphaChannel = new JCheckBoxMenuItem(new ToggleAlphaAction());
     protected String baseURL;
     protected final int serializeFormatVersion = 4;
@@ -75 +73 @@
     public WMSLayer(String name, String baseURL) {
         super(name);
+        alphaChannel.setSelected(Main.pref.getBoolean("wmsplugin.alpha_channel"));
         background = true; /* set global background variable */
         initializeImages();
@@ -81 +80 @@
         mv = Main.map.mapView;
         getPPD();
-
+        
         executor = Executors.newFixedThreadPool(3);
     }
@@ -166 +165 @@
             return;
         }
-
+        
         for(int x = bminx; x<bmaxx; ++x)
             for(int y = bminy; y<bmaxy; ++y){
@@ -203 +202 @@
                 new JSeparator(),
                 startstop,
+                alphaChannel,
                 new JMenuItem(new changeResolutionAction()),
                 new JMenuItem(new downloadAction()),
@@ -237 +237 @@
             getPPD();
             mv.repaint();
+        }
+    }
+    
+    public class ToggleAlphaAction extends AbstractAction {
+        public ToggleAlphaAction() {
+            super(tr("Alpha channel"));
+        }
+        public void actionPerformed(ActionEvent ev) {
+            JCheckBoxMenuItem checkbox = (JCheckBoxMenuItem) ev.getSource();
+            boolean alphaChannel = checkbox.isSelected();
+            Main.pref.put("wmsplugin.alpha_channel", alphaChannel);
+            Main.map.repaint();
         }
     }