Changeset 18256 in osm for applications/editors

Timestamp:

2009-10-22T23:31:48+02:00 (15 years ago)

Author:

pieren

Message:

Re-implement the layer adjustment mode for the raster images fine positioning.

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CadastrePlugin.java (modified) (3 diffs)
• CadastrePreferenceSetting.java (modified) (6 diffs)
• WMSAdjustAction.java (added)
• WMSLayer.java (modified) (5 diffs)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -216 +217 @@
 
     private static void setEnabledAll(boolean isEnabled) {
-        boolean isLambertCC9Zones = Main.proj instanceof LambertCC9Zones;
         for (int i = 0; i < cadastreJMenu.getItemCount(); i++) {
             JMenuItem item = cadastreJMenu.getItem(i);
@@ -236 +236 @@
             if (oldFrame == null && newFrame != null) {
                 setEnabledAll(true);
-                /*Main.map.addMapMode(new IconToggleButton
-                        (new WMSAdjustAction(Main.map)));*/
+                Main.map.addMapMode(new IconToggleButton
+                        (new WMSAdjustAction(Main.map)));
             } else if (oldFrame != null && newFrame == null) {
                 setEnabledAll(false);

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

@@ -44 +44 @@
 
     private JRadioButton grabMultiplier4 = new JRadioButton("", true);
+    
+    private JRadioButton crosspiece1 = new JRadioButton("off");
+    
+    private JRadioButton crosspiece2 = new JRadioButton("50m");
+
+    private JRadioButton crosspiece3 = new JRadioButton("100m");
 
     static final int DEFAULT_SQUARE_SIZE = 100;
@@ -57 +63 @@
     private JTextField rasterDivider = new JTextField(10);
 
+    static final int DEFAULT_CROSSPIECES = 0;
+    
     public void addGui(final PreferenceDialog gui) {
 
@@ -115 +123 @@
         JLabel jLabelScale = new JLabel(tr("Vector images grab multiplier:"));
         cadastrewms.add(jLabelScale, GBC.std().insets(0, 5, 10, 0));
-        ButtonGroup bg = new ButtonGroup();
+        ButtonGroup bgGrabMultiplier = new ButtonGroup();
         ActionListener multiplierActionListener = new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {
@@ -137 +145 @@
         grabMultiplier4.addActionListener( multiplierActionListener);
         grabMultiplier4.setToolTipText(tr("Fixed size square (default is 100m)"));
-        bg.add(grabMultiplier1);
-        bg.add(grabMultiplier2);
-        bg.add(grabMultiplier3);
-        bg.add(grabMultiplier4);
+        bgGrabMultiplier.add(grabMultiplier1);
+        bgGrabMultiplier.add(grabMultiplier2);
+        bgGrabMultiplier.add(grabMultiplier3);
+        bgGrabMultiplier.add(grabMultiplier4);
         String currentScale = Main.pref.get("cadastrewms.scale", "1");
         if (currentScale.equals(Scale.X1.value))
@@ -173 +181 @@
         disableImageCropping.setSelected(Main.pref.getBoolean("cadastrewms.noImageCropping", false));
         disableImageCropping.setToolTipText(tr("Disable image cropping during georeferencing."));
-        cadastrewms.add(disableImageCropping, GBC.eop().insets(0, 0, 0, 5));
+        cadastrewms.add(disableImageCropping, GBC.eop().insets(0, 0, 0, 0));
+        // the crosspiece display
+        JLabel jLabelCrosspieces = new JLabel(tr("Display crosspieces:"));
+        cadastrewms.add(jLabelCrosspieces, GBC.std().insets(0, 0, 10, 0));
+        ButtonGroup bgCrosspieces = new ButtonGroup();
+        int crosspieces = getNumber("cadastrewms.crosspieces", DEFAULT_CROSSPIECES);
+        if (crosspieces == 0) crosspiece1.setSelected(true);
+        if (crosspieces == 1) crosspiece2.setSelected(true);
+        if (crosspieces == 2) crosspiece3.setSelected(true);
+        bgCrosspieces.add(crosspiece1);
+        bgCrosspieces.add(crosspiece2);
+        bgCrosspieces.add(crosspiece3);
+        cadastrewms.add(crosspiece1, GBC.std().insets(5, 0, 5, 0));
+        cadastrewms.add(crosspiece2, GBC.std().insets(5, 0, 5, 0));
+        cadastrewms.add(crosspiece3, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 5, 0, 5));
 
         // separator
@@ -230 +252 @@
         }
         Main.pref.put("cadastrewms.noImageCropping", disableImageCropping.isSelected());
+        if (crosspiece1.isSelected()) Main.pref.put("cadastrewms.crosspieces", "0");
+        else if (crosspiece2.isSelected()) Main.pref.put("cadastrewms.crosspieces", "1");
+        else if (crosspiece3.isSelected()) Main.pref.put("cadastrewms.crosspieces", "2");
         Main.pref.put("cadastrewms.enableCaching", enableCache.isSelected());
 

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

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
+import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
@@ -19 +21 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import javax.swing.JDialog;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -25 +26 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.projection.Lambert;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
 import org.openstreetmap.josm.data.Bounds;
@@ -203 +203 @@
                 img.paint((Graphics2D) g, mv, CadastrePlugin.backgroundTransparent,
                         CadastrePlugin.transparency, CadastrePlugin.drawBoundaries);
+        }
+        if (this.isRaster) {
+            paintCrosspieces(g, mv);
         }
     }
@@ -527 +530 @@
     }
 
+    public EastNorth getRasterCenter() {
+        return new EastNorth((images.get(0).max.east()+images.get(0).min.east())/2,
+                (images.get(0).max.north()+images.get(0).min.north())/2);
+    }
+    
+    public void displace(double dx, double dy) {
+        this.rasterMin = new EastNorth(rasterMin.east() + dx, rasterMin.north() + dy);
+        images.get(0).shear(dx, dy);
+    }
+
+    public void resize(EastNorth rasterCenter, double proportion) {
+        this.rasterMin = rasterMin.interpolate(rasterCenter, proportion);
+        images.get(0).scale(rasterCenter, proportion);
+    }
+
+    public void rotate(EastNorth rasterCenter, double angle) {
+        this.rasterMin = rasterMin.rotate(rasterCenter, angle);
+        images.get(0).rotate(rasterCenter, angle);
+    }
+
+    private void paintCrosspieces(Graphics g, MapView mv) {
+        String crosspieces = Main.pref.get("cadastrewms.crosspieces", "0");
+        if (!crosspieces.equals("0")) {
+            int modulo = 50;
+            if (crosspieces.equals("2")) modulo = 100; 
+            EastNorthBound currentView = new EastNorthBound(mv.getEastNorth(0, mv.getHeight()),
+                    mv.getEastNorth(mv.getWidth(), 0));
+            int minX = ((int)currentView.min.east()/modulo+1)*modulo;
+            int minY = ((int)currentView.min.north()/modulo+1)*modulo;
+            int maxX = ((int)currentView.max.east()/modulo)*modulo;
+            int maxY = ((int)currentView.max.north()/modulo)*modulo;
+            int size=(maxX-minX)/modulo;
+            if (size<20) {
+                int px= size > 10 ? 2 : Math.abs(12-size);
+                g.setColor(Color.green);
+                for (int x=minX; x<=maxX; x+=modulo) {
+                    for (int y=minY; y<=maxY; y+=modulo) {
+                        Point p = mv.getPoint(new EastNorth(x,y));
+                        g.drawLine(p.x-px, p.y, p.x+px, p.y);
+                        g.drawLine(p.x, p.y-px, p.x, p.y+px);
+                    }
+                }
+            }
+        }
+    }
+    
 }