Changeset 22779 in osm

Timestamp:

2010-08-26T07:56:39+02:00 (14 years ago)

Author:

jttt

Message:

• do not redraw when nothing changed
• resize GeorefImage array when necessary (for large screens)
• keep resized images as SoftReference

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• .classpath (modified) (1 diff)
• src/wmsplugin/GeorefImage.java (modified) (9 diffs)
• src/wmsplugin/WMSLayer.java (modified) (6 diffs)

applications/editors/josm/plugins/wmsplugin/.classpath

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

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java

@@ -13 +13 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.lang.ref.SoftReference;
 
 import javax.imageio.ImageIO;
@@ -28 +29 @@
 
         private BufferedImage image;
-        private BufferedImage reImg = null;
+        private SoftReference<BufferedImage> reImg;
         private int xIndex;
         private int yIndex;
@@ -51 +52 @@
                         this.yIndex = yIndex;
                         this.image = null;
-                        this.reImg = null;
+                        flushedResizedCachedInstance();
                 }
         }
@@ -60 +61 @@
 
         public void changeImage(State state, BufferedImage image) {
+                flushedResizedCachedInstance();
                 this.image = image;
-                this.reImg = null;
                 this.state = state;
 
@@ -126 +127 @@
                         return false;
 
-                if(reImg != null && reImg.getWidth() == width && reImg.getHeight() == height) {
-                        g.drawImage(reImg, x, y, null);
+                BufferedImage img = reImg == null?null:reImg.get();
+                if(img != null && img.getWidth() == width && img.getHeight() == height) {
+                        g.drawImage(img, x, y, null);
                         return true;
                 }
@@ -134 +136 @@
 
                 try {
-                        if(reImg != null) reImg.flush();
+                        if(img != null) img.flush();
                         long freeMem = Runtime.getRuntime().maxMemory() - Runtime.getRuntime().totalMemory();
                         //System.out.println("Free Memory:           "+ (freeMem/1024/1024) +" MB");
@@ -149 +151 @@
                         } else {
                                 // We haven't got a saved resized copy, so resize and cache it
-                                reImg = new BufferedImage(width, height, alphaChannel?BufferedImage.TYPE_INT_ARGB:BufferedImage.TYPE_3BYTE_BGR);
-                                reImg.getGraphics().drawImage(getImage(),
+                                img = new BufferedImage(width, height, alphaChannel?BufferedImage.TYPE_INT_ARGB:BufferedImage.TYPE_3BYTE_BGR);
+                                img.getGraphics().drawImage(getImage(),
                                                 0, 0, width, height, // dest
                                                 0, 0, getImage().getWidth(null), getImage().getHeight(null), // src
                                                 null);
-                                reImg.getGraphics().dispose();
-                                g.drawImage(reImg, x, y, null);
+                                img.getGraphics().dispose();
+                                g.drawImage(img, x, y, null);
+                                reImg = new SoftReference<BufferedImage>(img);
                         }
                 } catch(Exception e) {
@@ -164 +167 @@
 
         private void fallbackDraw(Graphics g, Image img, int x, int y, int width, int height) {
-                if(reImg != null) {
-                        reImg.flush();
-                        reImg = null;
-                }
+                flushedResizedCachedInstance();
                 g.drawImage(
                                 img, x, y, x + width, y + height,
@@ -195 +195 @@
 
         public void flushedResizedCachedInstance() {
+                if (reImg != null) {
+                        BufferedImage img = reImg.get();
+                        if (img != null) {
+                                img.flush();
+                        }
+                }
                 reImg = null;
         }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -61 +61 @@
         protected MapView mv;
         protected String resolution;
-        protected boolean stopAfterPaint = false;
         protected int imageSize = 500;
         protected int dax = 10;
         protected int day = 10;
+        protected int daStep = 5;
         protected int minZoom = 3;
+
+        protected boolean deltaChanged;
         protected double dx = 0.0;
         protected double dy = 0.0;
+
         protected double pixelPerDegree;
-        protected GeorefImage[][] images = new GeorefImage[dax][day];
+        protected GeorefImage[][] images;
         protected String baseURL;
         protected String cookies;
@@ -152 +155 @@
 
         public void initializeImages() {
+                GeorefImage[][] old = images;
                 images = new GeorefImage[dax][day];
+                if (old != null) {
+                        for (int i=0; i<old.length; i++) {
+                                for (int k=0; k<old[i].length; k++) {
+                                        GeorefImage o = old[i][k];
+                                        images[modulo(o.getXIndex(),dax)][modulo(o.getYIndex(),day)] = old[i][k];
+                                }
+                        }
+                }
                 for(int x = 0; x<dax; ++x) {
                         for(int y = 0; y<day; ++y) {
-                                images[x][y]= new GeorefImage(this);
+                                if (images[x][y] == null) {
+                                        images[x][y]= new GeorefImage(this);
+                                }
                         }
                 }
@@ -188 +202 @@
 
         @Override public void paint(Graphics2D g, final MapView mv, Bounds b) {
+                deltaChanged = false;
                 if(baseURL == null) return;
                 if (usesInvalidUrl && !isInvalidUrlConfirmed) return;
@@ -246 +261 @@
 
         public void displace(double dx, double dy) {
+                deltaChanged = true;
                 this.dx += dx;
                 this.dy += dy;
@@ -278 +294 @@
 
         protected void downloadAndPaintVisible(Graphics g, final MapView mv, boolean real){
+
+                int newDax = dax;
+                int newDay = day;
+
+                if (bmaxx - bminx >= dax || bmaxx - bminx < dax - 2 * daStep) {
+                        newDax = ((bmaxx - bminx) / daStep + 1) * daStep;
+                }
+
+                if (bmaxy - bminy >= day || bmaxy - bminx < day - 2 * daStep) {
+                        newDay = ((bmaxy - bminy) / daStep + 1) * daStep;
+                }
+
+                if (newDax != dax || newDay != day) {
+                        dax = newDax;
+                        day = newDay;
+                        initializeImages();
+                }
 
                 for(int x = bminx; x<=bmaxx; ++x) {
@@ -706 +739 @@
         }
 
+        @Override
+        public boolean isChanged() {
+                requestQueueLock.lock();
+                try {
+                        return !finishedRequests.isEmpty() || deltaChanged;
+                } finally {
+                        requestQueueLock.unlock();
+                }
+        }
+
         public void preferenceChanged(PreferenceChangeEvent event) {
                 if (event.getKey().equals(WMSPlugin.PROP_SIMULTANEOUS_CONNECTIONS.getKey())) {