Changeset 3116 in josm for trunk/src/org/openstreetmap/josm/gui/MapView.java

Timestamp:

11.03.2010 21:01:49 (2 years ago)

Author:

jttt

Message:

Reuse offscreenBuffer if layers didn't change

File:

• trunk/src/org/openstreetmap/josm/gui/MapView.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -159 +159 @@
      * A list of all layers currently loaded.
      */
-    private ArrayList<Layer> layers = new ArrayList<Layer>();
+    private final List<Layer> layers = new ArrayList<Layer>();
     /**
      * The play head marker: there is only one of these so it isn't in any specific layer
@@ -180 +180 @@
 
     private BufferedImage offscreenBuffer;
+    // Layers that wasn't changed since last paint
+    private final List<Layer> nonChangedLayers = new ArrayList<Layer>();
 
     public MapView() {
@@ -458 +460 @@
             return; // no data loaded yet.
 
-        // re-create offscreen-buffer if we've been resized, otherwise
-        // just re-use it.
-        if (null == offscreenBuffer || offscreenBuffer.getWidth() != getWidth()
-                || offscreenBuffer.getHeight() != getHeight()) {
-            offscreenBuffer = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_3BYTE_BGR);
-        }
-
-        Graphics2D tempG = offscreenBuffer.createGraphics();
-        tempG.setClip(g.getClip());
-        tempG.setColor(PaintColors.BACKGROUND.get());
-        tempG.fillRect(0, 0, getWidth(), getHeight());
-
+        List<Layer> visibleLayers = getVisibleLayersInZOrder();
+
+        int nonChangedLayersCount = 0;
+        for (Layer l: visibleLayers) {
+            if (l.isChanged()) {
+                break;
+            } else {
+                nonChangedLayersCount++;
+            }
+        }
+
+        boolean canUseBuffer = nonChangedLayers.size() <= nonChangedLayersCount;
+        if (canUseBuffer) {
+            for (int i=0; i<nonChangedLayers.size(); i++) {
+                if (visibleLayers.get(i) != nonChangedLayers.get(i)) {
+                    canUseBuffer = false;
+                    break;
+                }
+            }
+        }
+
+        Graphics2D tempG = (Graphics2D) g;
         Bounds box = getLatLonBounds(g.getClipBounds());
 
-        for (Layer l: getVisibleLayersInZOrder()) {
-            l.paint(tempG, this, box);
-        }
+        if (!canUseBuffer || offscreenBuffer == null) {
+            if (null == offscreenBuffer || offscreenBuffer.getWidth() != getWidth() || offscreenBuffer.getHeight() != getHeight()) {
+                offscreenBuffer = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_3BYTE_BGR);
+            }
+            Graphics2D g2 = offscreenBuffer.createGraphics();
+            g2.setColor(PaintColors.BACKGROUND.get());
+            g2.fillRect(0, 0, getWidth(), getHeight());
+
+            for (int i=0; i<nonChangedLayersCount; i++) {
+                visibleLayers.get(i).paint(g2, this, box);
+            }
+        } else {
+            // Maybe there were more unchanged layers then last time - draw them to buffer
+            if (nonChangedLayers.size() != nonChangedLayersCount) {
+                Graphics2D g2 = offscreenBuffer.createGraphics();
+                for (int i=nonChangedLayers.size(); i<nonChangedLayersCount; i++) {
+                    visibleLayers.get(i).paint(g2, this, box);
+                }
+            }
+        }
+
+        nonChangedLayers.clear();
+        for (int i=0; i<nonChangedLayersCount; i++) {
+            nonChangedLayers.add(visibleLayers.get(i));
+        }
+
+        tempG.drawImage(offscreenBuffer, 0, 0, null);
+
+        for (int i=nonChangedLayersCount; i<visibleLayers.size(); i++) {
+            visibleLayers.get(i).paint(tempG, this, box);
+        }
+
         for (MapViewPaintable mvp : temporaryLayers) {
             mvp.paint(tempG, this, box);
@@ -515 +556 @@
         }
 
-        int w = offscreenBuffer.getWidth();
-        int h = offscreenBuffer.getHeight();
+        int w = getWidth();
+        int h = getHeight();
 
         // Work around OpenJDK having problems when drawing out of bounds
@@ -530 +571 @@
         }
 
-        g.drawImage(offscreenBuffer, 0, 0, null);
         super.paint(g);
     }