Changeset 24615 in osm for applications

Timestamp:

2010-12-06T15:34:54+01:00 (14 years ago)

Author:

upliner

Message:

Implement imagery sharpening(idea by Stephan Knauss)

Location:

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery

Files:

• ImageryLayer.java (modified) (3 diffs)
• ImageryPlugin.java (modified) (1 diff)
• ImageryPreferenceEditor.java (modified) (7 diffs)
• ImageryPreferences.java (modified) (1 diff)
• tms/TMSLayer.java (modified) (2 diffs)
• wms/GeorefImage.java (modified) (1 diff)
• wms/HTMLGrabber.java (modified) (2 diffs)
• wms/WMSAdapter.java (modified) (2 diffs)
• wms/WMSGrabber.java (modified) (1 diff)
• wms/WMSLayer.java (modified) (1 diff)

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryLayer.java

@@ -8 +8 @@
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ConvolveOp;
+import java.awt.image.Kernel;
 import java.util.List;
 
@@ -41 +45 @@
     protected double dy = 0.0;
 
+    protected int sharpenLevel;
+
     public ImageryLayer(ImageryInfo info) {
         super(info.getName());
         this.info = info;
         this.mv = Main.map.mapView;
+        this.sharpenLevel = ImageryPreferences.PROP_SHARPEN_LEVEL.get();
     }
 
@@ -175 +182 @@
     }
 
+    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;
+        if (sharpenLevel == 1) {
+            kernel = new Kernel(2, 2, new float[] { 4, -1, -1, -1});
+        } else {
+            kernel = new Kernel(3, 3, new float[] { -1, -1, -1, -1, 9, -1, -1, -1, -1});
+        }
+        BufferedImageOp op = new ConvolveOp(kernel, ConvolveOp.EDGE_NO_OP, null);
+        return op.filter(tmp, null);
+    }
 }

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPlugin.java

@@ -57 +57 @@
     /** RemoteControlPlugin older than this SVN revision is not compatible */
     final int REMOTECONTROL_MIN_REVISION = 22734;
-    /** WMSPlugin needs this specific API major version of RemoteControlPlugin */
+    /** Imagery Plugin needs this specific API major version of RemoteControlPlugin */
     final int REMOTECONTROL_NEED_API_MAJOR = 1;
     /** All API minor versions starting from this should be compatible */

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferenceEditor.java

@@ -38 +38 @@
     ImageryProvidersPanel imageryProviders;
 
+    WMSAdapter wmsAdapter = ImageryPlugin.wmsAdapter;
+    ImageryPlugin plugin = ImageryPlugin.instance;
+
     // Common settings
     private Color colFadeColor;
@@ -43 +46 @@
     private JSlider fadeAmount = new JSlider(0, 100);
     private JCheckBox remoteCheckBox;
-    boolean allowRemoteControl = true;
+    private JComboBox sharpen;
+    private boolean allowRemoteControl = true;
 
     // WMS Settings
@@ -51 +55 @@
     JSpinner spinNorth;
     JSpinner spinSimConn;
-    WMSAdapter wmsAdapter = ImageryPlugin.wmsAdapter;
-    ImageryPlugin plugin = ImageryPlugin.instance;
 
     //TMS settings controls
@@ -98 +100 @@
         p.add(remoteCheckBox,GBC.eol().fill(GBC.HORIZONTAL));
 
+        this.sharpen = new JComboBox(new String[] {
+                tr("None"),
+                tr("Soft"),
+                tr("Strong")});
+        p.add(new JLabel(tr("Sharpen (requires layer re-add): ")));
+        p.add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
+        p.add(this.sharpen, GBC.std().fill(GBC.HORIZONTAL));
+        this.sharpen.setSelectedIndex(ImageryPreferences.PROP_SHARPEN_LEVEL.get());
+
         return p;
     }
@@ -109 +120 @@
                 "webkit-image-gtk {0}"});
         browser.setEditable(true);
-        browser.setSelectedItem(Main.pref.get("wmsplugin.browser", "webkit-image {0}"));
+        browser.setSelectedItem(wmsAdapter.PROP_BROWSER.get());
         p.add(new JLabel(tr("Downloader:")), GBC.eol().fill(GBC.HORIZONTAL));
         p.add(browser);
@@ -219 +230 @@
         allowRemoteControl = remoteCheckBox.getModel().isSelected();
 
-        Main.pref.put("wmsplugin.browser", browser.getEditor().getItem().toString());
-
+        Main.pref.put("imagery.wms.browser", browser.getEditor().getItem().toString());
 
         TMSPreferences.PROP_DEFAULT_AUTOZOOM.put(this.autozoomActive.isSelected());
@@ -227 +237 @@
         TMSPreferences.setMinZoomLvl((Integer)this.minZoomLvl.getValue());
 
-        ImageryPreferences.PROP_REMOTE_CONTROL.put(allowRemoteControl);
         ImageryPreferences.PROP_FADE_AMOUNT.put(this.fadeAmount.getValue());
         ImageryPreferences.setFadeColor(this.colFadeColor);
+        ImageryPreferences.PROP_REMOTE_CONTROL.put(allowRemoteControl);
+        ImageryPreferences.PROP_SHARPEN_LEVEL.put(sharpen.getSelectedIndex());
 
         return false;

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/ImageryPreferences.java

@@ -8 +8 @@
 
 public class ImageryPreferences {
-
     public static final BooleanProperty PROP_REMOTE_CONTROL = new BooleanProperty("imagery.remotecontrol", true);
     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);
 
     public static Color getFadeColor() {

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/tms/TMSLayer.java

@@ -53 +53 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.imagery.ImageryInfo;
+import org.openstreetmap.josm.plugins.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.plugins.imagery.ImageryLayer;
 import org.openstreetmap.josm.plugins.imagery.ImageryPreferences;
-import org.openstreetmap.josm.plugins.imagery.ImageryInfo.ImageryType;
 
 /**
@@ -85 +85 @@
         Main.map.repaint(100);
         tileRequestsOutstanding.remove(tile);
+        if (sharpenLevel != 0) tile.setImage(sharpenImage(tile.getImage()));
         if (debug)
             out("tileLoadingFinished() tile: " + tile + " success: " + success);

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/GeorefImage.java

@@ -97 +97 @@
         }
         default:
+            this.image = layer.sharpenImage(this.image);
             break;
         }

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/HTMLGrabber.java

@@ -10 +10 @@
 import javax.imageio.ImageIO;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.io.CacheFiles;
+import org.openstreetmap.josm.plugins.imagery.ImageryPlugin;
 
 public class HTMLGrabber extends WMSGrabber {
@@ -27 +27 @@
         ArrayList<String> cmdParams = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer(MessageFormat.format(
-                Main.pref.get("wmsplugin.browser", "webkit-image {0}"), urlstring));
+                ImageryPlugin.wmsAdapter.PROP_BROWSER.get(), urlstring));
         while( st.hasMoreTokens() )
             cmdParams.add(st.nextToken());

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSAdapter.java

@@ -4 +4 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.io.CacheFiles;
@@ -14 +15 @@
     CacheFiles cache = new CacheFiles("wmsplugin");
 
-    public final IntegerProperty PROP_SIMULTANEOUS_CONNECTIONS = new IntegerProperty("wmsplugin.simultaneousConnections", 3);
-    public final BooleanProperty PROP_OVERLAP = new BooleanProperty("wmsplugin.url.overlap", false);
-    public final IntegerProperty PROP_OVERLAP_EAST = new IntegerProperty("wmsplugin.url.overlapEast", 14);
-    public final IntegerProperty PROP_OVERLAP_NORTH = new IntegerProperty("wmsplugin.url.overlapNorth", 4);
+    public final StringProperty PROP_BROWSER = new StringProperty("imagery.wms.browser", "webkit-image {0}");
+    public final IntegerProperty PROP_SIMULTANEOUS_CONNECTIONS = new IntegerProperty("imagery.wms.simultaneousConnections", 3);
+    public final BooleanProperty PROP_OVERLAP = new BooleanProperty("imagery.wms.overlap", false);
+    public final IntegerProperty PROP_OVERLAP_EAST = new IntegerProperty("imagery.wms.overlapEast", 14);
+    public final IntegerProperty PROP_OVERLAP_NORTH = new IntegerProperty("imagery.wms.overlapNorth", 4);
 
     protected void initExporterAndImporter() {

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSGrabber.java

@@ -170 +170 @@
         if(layer.getInfo().getCookies() != null && !layer.getInfo().getCookies().equals(""))
             conn.setRequestProperty("Cookie", layer.getInfo().getCookies());
-        conn.setRequestProperty("User-Agent", Main.pref.get("wmsplugin.user_agent", Version.getInstance().getAgentString()));
-        conn.setConnectTimeout(Main.pref.getInteger("wmsplugin.timeout.connect", 30) * 1000);
-        conn.setReadTimeout(Main.pref.getInteger("wmsplugin.timeout.read", 30) * 1000);
+        conn.setRequestProperty("User-Agent", Main.pref.get("imagery.wms.user_agent", Version.getInstance().getAgentString()));
+        conn.setConnectTimeout(Main.pref.getInteger("imagery.wms.timeout.connect", 30) * 1000);
+        conn.setReadTimeout(Main.pref.getInteger("imagery.wms.timeout.read", 30) * 1000);
 
         String contentType = conn.getHeaderField("Content-Type");

applications/editors/josm/plugins/imagery/src/org/openstreetmap/josm/plugins/imagery/wms/WMSLayer.java

@@ -54 +54 @@
 public class WMSLayer extends ImageryLayer implements PreferenceChangedListener {
 
-    public static final BooleanProperty PROP_ALPHA_CHANNEL = new BooleanProperty("wmsplugin.alpha_channel", true);
+    public static final BooleanProperty PROP_ALPHA_CHANNEL = new BooleanProperty("imagery.wms.alpha_channel", true);
     WMSAdapter plugin = ImageryPlugin.wmsAdapter;