Changeset 26823 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java

Timestamp:

2011-10-09T23:41:21+02:00 (14 years ago)

Author:

pieren

Message:

Add a new possibility to shift cadastre vector maps (not saved in cache)

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java (modified) (11 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java ¶

@@ -12 +12 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import java.util.ArrayList;
 
 import javax.swing.JOptionPane;
@@ -22 +21 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.gui.layer.Layer;
 
 public class WMSAdjustAction extends MapMode implements
@@ -28 +26 @@
 
     private static final long serialVersionUID = 1L;
-    private ArrayList<WMSLayer> modifiedLayers = new ArrayList<WMSLayer>();
-    WMSLayer selectedLayer;
+    private WMSLayer modifiedLayer = null;
     private boolean rasterMoved;
     private EastNorth prevEastNorth;
@@ -38 +35 @@
     public WMSAdjustAction(MapFrame mapFrame) {
         super(tr("Adjust WMS"), "adjustxywms",
-                        tr("Adjust the position of the WMS layer (raster images only)"), mapFrame,
+                        tr("Adjust the position of the WMS layer (saved for raster images only)"), mapFrame,
                         ImageProvider.getCursor("normal", "move"));
     }
@@ -44 +41 @@
     @Override public void enterMode() {
         if (Main.map != null) {
-            selectedLayer = null;
-            WMSLayer possibleLayer = null;
-            int cRasterLayers = 0;
-            for (Layer l : Main.map.mapView.getAllLayers()) {
-                if (l instanceof WMSLayer && ((WMSLayer)l).isRaster()) {
-                    possibleLayer = (WMSLayer)l;
-                    cRasterLayers++;
-                }
-            }
-            Layer activeLayer = Main.map.mapView.getActiveLayer();
-            if (activeLayer instanceof WMSLayer && ((WMSLayer)activeLayer).isRaster()) {
-                selectedLayer = (WMSLayer)activeLayer;
-            } else if (cRasterLayers == 1) {
-                selectedLayer = possibleLayer;
-            }
-            if (selectedLayer != null) {
+            if (Main.map.mapView.getActiveLayer() instanceof WMSLayer) {
+                modifiedLayer = (WMSLayer)Main.map.mapView.getActiveLayer();
                 super.enterMode();
                 Main.map.mapView.addMouseListener(this);
                 Main.map.mapView.addMouseMotionListener(this);
                 rasterMoved = false;
-                selectedLayer.adjustModeEnabled = true;
+                modifiedLayer.adjustModeEnabled = true;
             } else {
-                JOptionPane.showMessageDialog(Main.parent,tr("This mode works only if active layer is\n"
-                        +"a cadastre \"plan image\" (raster image)"));
+//                JOptionPane.showMessageDialog(Main.parent,tr("This mode works only if active layer is\n"
+//                        +"a cadastre layer"));
                 exitMode();
                 Main.map.selectMapMode((MapMode)Main.map.getDefaultButtonAction());
@@ -78 +61 @@
         Main.map.mapView.removeMouseListener(this);
         Main.map.mapView.removeMouseMotionListener(this);
-        if (rasterMoved && CacheControl.cacheEnabled) {
+        if (rasterMoved && CacheControl.cacheEnabled && modifiedLayer.isRaster()) {
             int reply = JOptionPane.showConfirmDialog(null,
                     "Save the changes in cache ?",
@@ -87 +70 @@
             }
         }
-        modifiedLayers.clear();
-        if (selectedLayer != null) {
-            selectedLayer.adjustModeEnabled = false;
-            selectedLayer = null;
+        rasterMoved = false;
+        if (modifiedLayer != null) {
+            modifiedLayer.adjustModeEnabled = false;
+            modifiedLayer = null;
         }
     }
@@ -101 +84 @@
         // boolean alt = (e.getModifiers() & ActionEvent.ALT_MASK) != 0;
         boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;
-        if (shift && !ctrl)
+        if (shift && !ctrl && modifiedLayer.isRaster())
             mode = Mode.moveZ;
-        else if (shift && ctrl)
+        else if (shift && ctrl && modifiedLayer.isRaster())
             mode = Mode.rotate;
         else
@@ -124 +107 @@
             prevEastNorth = newEastNorth;
         }
-        if (!modifiedLayers.contains(selectedLayer))
-            modifiedLayers.add(selectedLayer);
         Main.map.mapView.repaint();
     }
@@ -141 +122 @@
 
     private void displace(EastNorth start, EastNorth end) {
-        selectedLayer.displace(end.east()-start.east(), end.north()-start.north());
+        modifiedLayer.displace(end.east()-start.east(), end.north()-start.north());
     }
 
     private void resize(EastNorth newEastNorth) {
-        EastNorth center = selectedLayer.getRasterCenter();
+        EastNorth center = modifiedLayer.getRasterCenter();
         double dPrev = prevEastNorth.distance(center.east(), center.north());
         double dNew = newEastNorth.distance(center.east(), center.north());
-        selectedLayer.resize(center, dNew/dPrev);
+        modifiedLayer.resize(center, dNew/dPrev);
     }
 
     private void rotate(EastNorth start, EastNorth end) {
-        EastNorth pivot = selectedLayer.getRasterCenter();
+        EastNorth pivot = modifiedLayer.getRasterCenter();
         double startAngle = Math.atan2(start.east()-pivot.east(), start.north()-pivot.north());
         double endAngle = Math.atan2(end.east()-pivot.east(), end.north()-pivot.north());
         double rotationAngle = endAngle - startAngle;
-        selectedLayer.rotate(pivot, rotationAngle);
+        modifiedLayer.rotate(pivot, rotationAngle);
     }
 
     private void rotateFrameOnly(EastNorth start, EastNorth end) {
         if (start != null && end != null) {
-            EastNorth pivot = selectedLayer.getRasterCenter();
+            EastNorth pivot = modifiedLayer.getRasterCenter();
             double startAngle = Math.atan2(start.east()-pivot.east(), start.north()-pivot.north());
             double endAngle = Math.atan2(end.east()-pivot.east(), end.north()-pivot.north());
             double rotationAngle = endAngle - startAngle;
-            if (selectedLayer.getImage(0).orgCroppedRaster != null) {
+            if (modifiedLayer.getImage(0).orgCroppedRaster != null) {
                 for (int i=0; i<4; i++) {
-                    croppedRaster[i] = selectedLayer.getImage(0).orgCroppedRaster[i].rotate(pivot, rotationAngle);
+                    croppedRaster[i] = modifiedLayer.getImage(0).orgCroppedRaster[i].rotate(pivot, rotationAngle);
                 }
                 croppedRaster[4] = croppedRaster[0];
@@ -197 +178 @@
 
     private void saveModifiedLayers() {
-        for (WMSLayer wmsLayer : modifiedLayers) {
-            wmsLayer.grabThread.saveNewCache();
-        }
+            modifiedLayer.grabThread.saveNewCache();
     }
 }