Changeset 24812 in osm for applications

Timestamp:

2010-12-20T13:04:26+01:00 (14 years ago)

Author:

upliner

Message:

Add imageryadjust plugin that enables old-style imagery adjust mapmode

Location:

applications/editors/josm/plugins/imageryadjust

Files:

• . (copied) (copied from applications/editors/josm/plugins/00_plugin_dir_template ) (1 prop)
• .classpath (copied) (copied from applications/editors/josm/plugins/wmsplugin/.classpath ) (1 diff)
• .project (copied) (copied from applications/editors/josm/plugins/wmsplugin/.project ) (1 diff)
• build.xml (modified) (2 diffs)
• src/imageryadjust (added)
• src/imageryadjust/ImageryAdjustMapMode.java (copied) (copied from applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java ) (7 diffs)
• src/imageryadjust/ImageryAdjustPlugin.java (added)

applications/editors/josm/plugins/imageryadjust/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry including="images/" kind="src" path=""/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-        <classpathentry combineaccessrules="false" kind="src" path="/remotecontrol"/>
         <classpathentry kind="output" path="build"/>
 </classpath>

applications/editors/josm/plugins/imageryadjust/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>wmsplugin</name>
+        <name>imageryadjust</name>
         <comment></comment>
         <projects>

applications/editors/josm/plugins/imageryadjust/build.xml

@@ -28 +28 @@
 **
 -->
-<project name="myPluginName" default="dist" basedir=".">
+<project name="imageryadjust" default="dist" basedir=".">
 
     <!-- enter the SVN commit message -->
@@ -100 +100 @@
     -->
             <manifest>
-                <attribute name="Author" value="..."/>
-                <attribute name="Plugin-Class" value="..."/>
+                <attribute name="Author" value="Upliner"/>
+                <attribute name="Plugin-Class" value="imageryadjust.ImageryAdjustPlugin"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="..."/>
-                <attribute name="Plugin-Icon" value="..."/>
-                <attribute name="Plugin-Link" value="..."/>
+                <attribute name="Plugin-Description" value="WMSPlugin-style imagery adjustment mapmode"/>
+                <attribute name="Plugin-Icon" value="mapmode/adjustimg.png"/>
+                <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/WMSPlugin"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java

@@ -1 @@
-package wmsplugin;
+package imageryadjust;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -25 +25 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
-public class WMSAdjustAction extends MapMode implements MouseListener, MouseMotionListener{
-    //static private final Logger logger = Logger.getLogger(WMSAdjustAction.class.getName());
-
-    GeorefImage selectedImage;
+public class ImageryAdjustMapMode extends MapMode implements MouseListener, MouseMotionListener{
     boolean mouseDown;
     EastNorth prevEastNorth;
-    private WMSLayer adjustingLayer;
+    private ImageryLayer adjustingLayer;
 
-    public WMSAdjustAction(MapFrame mapFrame) {
-        super(tr("Adjust WMS"), "adjustwms",
-                tr("Adjust the position of the selected WMS layer"), mapFrame,
+    public ImageryAdjustMapMode(MapFrame mapFrame) {
+        super(tr("Adjust imagery"), "adjustimg",
+                tr("Adjust the position of the selected imagery layer"), mapFrame,
                 ImageProvider.getCursor("normal", "move"));
     }
 
-
-
     @Override public void enterMode() {
         super.enterMode();
-        if (!hasWMSLayersToAdjust()) {
-            warnNoWMSLayers();
+        if (!hasImageryLayersToAdjust()) {
+            warnNoImageryLayers();
             return;
         }
-        List<WMSLayer> wmsLayers = Main.map.mapView.getLayersOfType(WMSLayer.class);
-        if (wmsLayers.size() == 1) {
-            adjustingLayer = wmsLayers.get(0);
+        List<ImageryLayer> layers = Main.map.mapView.getLayersOfType(ImageryLayer.class);
+        if (layers.size() == 1) {
+            adjustingLayer = layers.get(0);
         } else {
-            adjustingLayer = (WMSLayer)askAdjustLayer(Main.map.mapView.getLayersOfType(WMSLayer.class));
+            adjustingLayer = (ImageryLayer)askAdjustLayer(Main.map.mapView.getLayersOfType(ImageryLayer.class));
         }
         if (adjustingLayer == null)
@@ -80 +75 @@
         if (adjustingLayer.isVisible()) {
             prevEastNorth=Main.map.mapView.getEastNorth(e.getX(),e.getY());
-            selectedImage = adjustingLayer.findImage(prevEastNorth);
-            if(selectedImage!=null) {
-                Main.map.mapView.setCursor
-                (Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
-            }
+            Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
         }
     }
 
     @Override public void mouseDragged(MouseEvent e) {
-        if(selectedImage!=null) {
-            EastNorth eastNorth=
-                Main.map.mapView.getEastNorth(e.getX(),e.getY());
-            adjustingLayer.displace(
-                    eastNorth.east()-prevEastNorth.east(),
-                    eastNorth.north()-prevEastNorth.north()
-            );
-            prevEastNorth = eastNorth;
-            Main.map.mapView.repaint();
-        }
+        if (adjustingLayer == null || prevEastNorth == null) return;
+        EastNorth eastNorth=
+            Main.map.mapView.getEastNorth(e.getX(),e.getY());
+        adjustingLayer.displace(
+                eastNorth.east()-prevEastNorth.east(),
+                eastNorth.north()-prevEastNorth.north()
+        );
+        prevEastNorth = eastNorth;
+        Main.map.mapView.repaint();
     }
 
@@ -104 +94 @@
         Main.map.mapView.repaint();
         Main.map.mapView.setCursor(Cursor.getDefaultCursor());
-        selectedImage = null;
         prevEastNorth = null;
     }
 
-    @Override
-    public void mouseEntered(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseExited(MouseEvent e) {
-    }
-
-    @Override
-    public void mouseMoved(MouseEvent e) {
-    }
-
-    @Override public void mouseClicked(MouseEvent e) {
-    }
-
     @Override public boolean layerIsSupported(Layer l) {
-        return hasWMSLayersToAdjust();
+        return hasImageryLayersToAdjust();
     }
 
@@ -168 +142 @@
         JPanel pnl = new JPanel();
         pnl.setLayout(new GridBagLayout());
-        pnl.add(new JLabel(tr("Please select the WMS layer to adjust.")), GBC.eol());
+        pnl.add(new JLabel(tr("Please select the imagery layer to adjust.")), GBC.eol());
         pnl.add(layerList, GBC.eol());
 
         ExtendedDialog diag = new ExtendedDialog(
                 Main.parent,
-                tr("Select WMS layer"),
+                tr("Select imagery layer"),
                 new String[] { tr("Start adjusting"),tr("Cancel") }
         );
         diag.setContent(pnl);
-        diag.setButtonIcons(new String[] { "mapmode/adjustwms", "cancel" });
+        diag.setButtonIcons(new String[] { "mapmode/adjustimg", "cancel" });
         diag.showDialog();
         int decision = diag.getValue();
@@ -187 +161 @@
 
     /**
-     * Displays a warning message if there are no WMS layers to adjust
+     * Displays a warning message if there are no imagery layers to adjust
      *
      */
-    protected void warnNoWMSLayers() {
+    protected void warnNoImageryLayers() {
         JOptionPane.showMessageDialog(
                 Main.parent,
-                tr("There are currently no WMS layer to adjust."),
+                tr("There are currently no imagery layer to adjust."),
                 tr("No layers to adjust"),
                 JOptionPane.WARNING_MESSAGE
@@ -200 +174 @@
 
     /**
-     * Replies true if there is at least one WMS layer
+     * Replies true if there is at least one imagery layer
      *
-     * @return true if there is at least one WMS layer
+     * @return true if there is at least one imagery layer
      */
-    protected boolean hasWMSLayersToAdjust() {
+    protected boolean hasImageryLayersToAdjust() {
         if (Main.map == null) return false;
         if (Main.map.mapView == null) return false;
-        return ! Main.map.mapView.getLayersOfType(WMSLayer.class).isEmpty();
+        return ! Main.map.mapView.getLayersOfType(ImageryLayer.class).isEmpty();
     }
 
     @Override
     protected void updateEnabledState() {
-        setEnabled(hasWMSLayersToAdjust());
+        setEnabled(hasImageryLayersToAdjust());
     }
 }