Changeset 18595 in osm for applications/editors/josm/plugins/cadastre-fr

Timestamp:

2009-11-14T19:38:46+01:00 (15 years ago)

Author:

jttt

Message:

Updated to new MapViewPaintable.paint arguments

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/cadastre_fr/WMSLayer.java (modified) (18 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="A special handler for the French land registry WMS server."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
-                <attribute name="Plugin-Mainversion" value="2381"/>
+                <attribute name="Plugin-Mainversion" value="2450"/>
                 <attribute name="Plugin-Stage" value="60"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>

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

@@ -26 +26 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -34 +35 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -65 +65 @@
 
     private boolean isRaster = false;
-    
+
     private boolean isAlreadyGeoreferenced = false;
-    
+
     public double X0, Y0, angle, fX, fY;
 
@@ -73 +73 @@
     private EastNorth rasterMax;
     private double rasterRatio;
-    
+
     private JMenuItem saveAsPng;
 
@@ -103 +103 @@
         if (isRaster) {
             b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax));
-            divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider", 
+            divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
                     CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
         } else
@@ -203 +203 @@
 
     @Override
-    public void paint(Graphics g, final MapView mv) {
+    public void paint(Graphics2D g, final MapView mv, Bounds bounds) {
         synchronized(this){
             for (GeorefImage img : images)
-                img.paint((Graphics2D) g, mv, CadastrePlugin.backgroundTransparent,
+                img.paint(g, mv, CadastrePlugin.backgroundTransparent,
                         CadastrePlugin.transparency, CadastrePlugin.drawBoundaries);
         }
@@ -236 +236 @@
                 saveAsPng,
                 new JMenuItem(new LayerListPopup.InfoAction(this)),
-                
+
         };
         return component;
@@ -336 +336 @@
 
     /**
-     * Set raster positions used for grabbing and georeferencing. 
+     * Set raster positions used for grabbing and georeferencing.
      * rasterMin is the Eaast North of bottom left corner raster image on the screen when image is grabbed.
      * The bounds width and height are the raster width and height. The image width matches the current view
      * and the image height is adapted.
-     * Required: the communeBBox must be set (normally it is catched by CadastreInterface and saved by DownloadWMSPlanImage)   
+     * Required: the communeBBox must be set (normally it is catched by CadastreInterface and saved by DownloadWMSPlanImage)
      * @param bounds the current main map view boundaries
      */
@@ -347 +347 @@
         EastNorth eaMin = Main.proj.latlon2eastNorth(bounds.getMin());
         EastNorth eaMax = Main.proj.latlon2eastNorth(bounds.getMax());
-        double rasterSizeX = communeBBox.max.getX() - communeBBox.min.getX(); 
+        double rasterSizeX = communeBBox.max.getX() - communeBBox.min.getX();
         double rasterSizeY = communeBBox.max.getY() - communeBBox.min.getY();
         double ratio = rasterSizeY/rasterSizeX;
@@ -443 +443 @@
         return true;
     }
-    
+
     /**
      * Join the grabbed images into one single.
@@ -454 +454 @@
             EastNorth max = images.get(images.size()-1).max;
             int oldImgWidth = images.get(0).image.getWidth();
-            int oldImgHeight = images.get(0).image.getHeight(); 
+            int oldImgHeight = images.get(0).image.getHeight();
             int newWidth = oldImgWidth*(int)Math.sqrt(images.size());
             int newHeight = oldImgHeight*(int)Math.sqrt(images.size());
@@ -475 +475 @@
         }
     }
-    
+
     /**
      * Image cropping based on two EN coordinates pointing to two corners in diagonal
      * Because it's coming from user mouse clics, we have to sort de positions first.
      * Works only for raster image layer (only one image in collection).
-     * Updates layer georeferences. 
+     * Updates layer georeferences.
      * @param en1
      * @param en2
      */
     public void cropImage(EastNorth en1, EastNorth en2){
-        // adj1 is corner bottom, left 
+        // adj1 is corner bottom, left
         EastNorth adj1 = new EastNorth(en1.east() <= en2.east() ? en1.east() : en2.east(),
                 en1.north() <= en2.north() ? en1.north() : en2.north());
@@ -501 +501 @@
         Graphics g = new_img.getGraphics();
         g.drawImage(images.get(0).image, 0, 0, newWidth-1, newHeight-1,
-                (int)sx1, (int)sy1, (int)sx2, (int)sy2,
+                sx1, sy1, sx2, sy2,
                 this);
         images.set(0, new GeorefImage(new_img, adj1, adj2));
@@ -522 +522 @@
 
     /**
-     * Method required by ImageObserver when drawing an image 
+     * Method required by ImageObserver when drawing an image
      */
     public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
@@ -540 +540 @@
             if (Main.map.mapView.getAllLayers().size() == 1) {
                 /* Enable this code below when JOSM will have a proper support of dynamic projection change
-                 * 
+                 *
                 System.out.println("close all layers and change current Lambert zone from "+LambertCC9Zones.layoutZone+" to "+lambertZone);
                 Bounds b = null;
@@ -562 +562 @@
                 (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);
@@ -582 +582 @@
         if (!crosspieces.equals("0")) {
             int modulo = 50;
-            if (crosspieces.equals("2")) modulo = 100; 
+            if (crosspieces.equals("2")) modulo = 100;
             EastNorthBound currentView = new EastNorthBound(mv.getEastNorth(0, mv.getHeight()),
                     mv.getEastNorth(mv.getWidth(), 0));
@@ -603 +603 @@
         }
     }
-    
+
 }