Changeset 24672 in osm for applications

Timestamp:

2010-12-09T23:04:59+01:00 (14 years ago)

Author:

upliner

Message:

Add Offset submenu to the Imagery menu

Location:

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

Files:

• ImageryAdjustAction.java (modified) (6 diffs)
• ImageryLayer.java (modified) (2 diffs)
• ImageryPlugin.java (modified) (9 diffs)
• ImageryPreferenceEditor.java (modified) (1 diff)
• tms/TMSTileSourceProvider.java (modified) (1 diff)

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

@@ -38 +38 @@
     public ImageryAdjustAction(ImageryLayer layer) {
         super(tr("New offset"), "adjustimg",
-                tr("Adjust the position of the selected imagery layer"), Main.map,
+                tr("Adjust the position of this imagery layer"), Main.map,
                 cursor);
         this.layer = layer;
@@ -86 +86 @@
         double dx = layer.getDx()+eastNorth.east()-prevEastNorth.east();
         double dy = layer.getDy()+eastNorth.north()-prevEastNorth.north();
+        layer.setOffset(dx, dy);
         if (offsetDialog != null) {
-            offsetDialog.easting.setValue(dx);
-            offsetDialog.northing.setValue(dy);
+            offsetDialog.updateOffset();
         }
+        Main.map.repaint();
         prevEastNorth = eastNorth;
     }
@@ -108 +109 @@
 
     class ImageryOffsetDialog extends ExtendedDialog implements PropertyChangeListener {
-        public final JFormattedTextField easting = new JFormattedTextField(new DecimalFormat("0.0000E0"));
-        public final JFormattedTextField northing = new JFormattedTextField(new DecimalFormat("0.0000E0"));
+        public final JFormattedTextField easting = new JFormattedTextField(new DecimalFormat("0.00000E0"));
+        public final JFormattedTextField northing = new JFormattedTextField(new DecimalFormat("0.00000E0"));
         JTextField tBookmarkName = new JTextField();
+        private boolean ignoreListener;
         public ImageryOffsetDialog() {
             super(Main.parent,
@@ -116 +118 @@
                     new String[] { tr("OK"),tr("Cancel") },
                     false);
-            setButtonIcons(new String[] { "mapmode/adjustimg", "cancel" });
+            setButtonIcons(new String[] { "ok", "cancel" });
             contentInsets = new Insets(15, 15, 5, 15);
             JPanel pnl = new JPanel();
@@ -138 +140 @@
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
+            if (ignoreListener) return;
             layer.setOffset(((Number)easting.getValue()).doubleValue(), ((Number)northing.getValue()).doubleValue());
             Main.map.repaint();
+        }
+
+        public void updateOffset() {
+            ignoreListener = true;
+            easting.setValue(layer.getDx());
+            northing.setValue(layer.getDy());
+            ignoreListener = false;
         }
 
@@ -156 +166 @@
                 OffsetBookmark.saveBookmarks();
             }
+            ImageryPlugin.instance.refreshOffsetMenu();
             Main.map.selectSelectTool(false);
         }

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

@@ -4 +4 @@
 
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -110 +111 @@
 
         @Override
-        public void actionPerformed(ActionEvent arg0) {
+        public void actionPerformed(ActionEvent ev) {
             setOffset(b.dx, b.dy);
             Main.map.repaint();
+            if (!(ev.getSource() instanceof Component)) return;
+            Component source = (Component)ev.getSource();
+            if (!(source.getParent() instanceof Container)) return;
+            Container m = source.getParent();
+            for (Component c : m.getComponents()) {
+                if (c instanceof JCheckBoxMenuItem && c != source) {
+                    ((JCheckBoxMenuItem)c).setSelected(false);
+                }
+            }
         }
     }

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
-
+import static org.openstreetmap.josm.tools.I18n.trc;
+
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -10 +12 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.List;
 
 import javax.swing.JMenu;
@@ -20 +23 @@
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -32 +38 @@
 import org.openstreetmap.josm.plugins.imagery.wms.io.WMSLayerExporter;
 import org.openstreetmap.josm.plugins.imagery.wms.io.WMSLayerImporter;
-
-public class ImageryPlugin extends Plugin {
+import org.openstreetmap.josm.tools.ImageProvider;
+
+public class ImageryPlugin extends Plugin implements LayerChangeListener {
 
     JMenu imageryJMenu;
+    JMenu offsetJMenu = new JMenu(trc("layer","Offset"));
 
     public static ImageryPlugin instance;
@@ -209 +217 @@
         initRemoteControl();
         SlippyMapBBoxChooser.addTileSourceProvider(new TMSTileSourceProvider());
+
+        offsetJMenu.setIcon(ImageProvider.get("imagery_menu"));
+        refreshOffsetMenu();
+        MapView.addLayerChangeListener(this);
     }
 
@@ -232 +244 @@
         imageryJMenu.add(new JMenuItem(new Map_Rectifier_WMSmenuAction()));
 
+        imageryJMenu.addSeparator();
+        imageryJMenu.add(offsetJMenu);
         imageryJMenu.addSeparator();
         imageryJMenu.add(new JMenuItem(new
@@ -243 +257 @@
     }
 
+    public void refreshOffsetMenu() {
+        offsetJMenu.removeAll();
+        if (Main.map == null || Main.map.mapView == null) {
+            offsetJMenu.setEnabled(false);
+            return;
+        }
+        List<ImageryLayer> layers = Main.map.mapView.getLayersOfType(ImageryLayer.class);
+        if (layers.isEmpty()) {
+            offsetJMenu.setEnabled(false);
+            return;
+        }
+        offsetJMenu.setEnabled(true);
+        if (layers.size() == 1) {
+            for (Component c : layers.get(0).getOffsetMenu()) {
+                offsetJMenu.add(c);
+            }
+            return;
+        }
+        for (ImageryLayer layer : layers) {
+            JMenu subMenu = new JMenu(layer.getName());
+            subMenu.setIcon(layer.getIcon());
+            for (Component c : layer.getOffsetMenu()) {
+                subMenu.add(c);
+            }
+            offsetJMenu.add(subMenu);
+        }
+    }
+
     private void setEnabledAll(boolean isEnabled) {
         for(int i=0; i < imageryJMenu.getItemCount(); i++) {
@@ -259 +301 @@
             setEnabledAll(false);
         }
+        refreshOffsetMenu();
     }
 
@@ -271 +314 @@
         return new File(Main.pref.getPluginsDirectory(), "imagery").getPath();
     }
+
+    @Override
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+    }
+
+    @Override
+    public void layerAdded(Layer newLayer) {
+        if (newLayer instanceof ImageryLayer) {
+            refreshOffsetMenu();
+        }
+    }
+
+    @Override
+    public void layerRemoved(Layer oldLayer) {
+        if (oldLayer instanceof ImageryLayer) {
+            refreshOffsetMenu();
+        }
+    }
 }

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

@@ -228 +228 @@
         plugin.info.save();
         plugin.refreshMenu();
+        plugin.refreshOffsetMenu();
         OffsetBookmark.saveBookmarks();
 

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

@@ -20 +20 @@
         // Urls that already exist in the slippymap chooser
         existingSlippyMapUrls.add("http://tile.openstreetmap.org/");
-        existingSlippyMapUrls.add("http://tah.openstreetmap.org/Tiles/");
+        existingSlippyMapUrls.add("http://tah.openstreetmap.org/Tiles/tile/");
         existingSlippyMapUrls.add("http://tile.opencyclemap.org/cycle/");
     }