Changeset 24955 in osm for applications/editors/josm

Timestamp:

2011-01-03T11:16:46+01:00 (14 years ago)

Author:

clementm

Message:

IMPROVEMENT: Display the current downloading box (orange) even if download queue is empty.
BUGFIX: Enables loading old Cache format and adding new images to them (Loading a cache in format 3 will continue to be stored as format 3).

Location:

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

Files:

• GeorefImage.java (modified) (3 diffs)
• WMSLayer.java (modified) (2 diffs)

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

@@ -46 +46 @@
     public GeorefImage(BufferedImage img, EastNorth min, EastNorth max) {
         image = img;
-
+ 
         this.min = min;
         this.max = max;
@@ -141 +141 @@
             }
         }
-        g.drawImage(image, minPt.x, maxPt.y, maxPt.x, minPt.y, // dest
-                0, 0, image.getWidth(), image.getHeight(), // src
-                null);
+            g.drawImage(image, minPt.x, maxPt.y, maxPt.x, minPt.y, // dest
+                        0, 0, image.getWidth(), image.getHeight(), // src
+                        null);
         if (backgroundTransparent && transparency < 1.0f)
             g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1.0f));
@@ -237 +237 @@
         out.writeDouble(orgCroppedRaster[2].getX()); out.writeDouble(orgCroppedRaster[2].getY());
         out.writeDouble(orgCroppedRaster[3].getX()); out.writeDouble(orgCroppedRaster[3].getY());
-        out.writeInt(imageOriginalHeight);
-        out.writeInt(imageOriginalWidth);
+        // Write image as a format 3 if cache was loaded with this format to avoid incompatibilities.
+        if (WMSLayer.currentFormat >= 4) {
+            out.writeInt(imageOriginalHeight);
+            out.writeInt(imageOriginalWidth);
+        }
         ImageIO.write(image, "png", ImageIO.createImageOutputStream(out));
     }

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

@@ -231 +231 @@
             paintCrosspieces(g, mv);
         }
-        if (grabThread.getImagesToGrabSize() > 0) {
+        //        if (grabThread.getImagesToGrabSize() > 0) {
             grabThread.paintBoxesToGrab(g, mv);
-        }
+            //        }
         if (this.adjustModeEnabled) {
             WMSAdjustAction.paintAdjustFrames(g, mv);
@@ -379 +379 @@
      */
     public void write(ObjectOutputStream oos) throws IOException {
+        // Set currentFormat to the serializeFormatVersion
+        currentFormat = this.serializeFormatVersion;
         oos.writeInt(this.serializeFormatVersion);
         oos.writeObject(this.location);    // String