Changeset 3119 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2010-03-12T08:18:44+01:00 (14 years ago)

Author:

jttt

Message:

Cache offscreen buffer for GpxLayer

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -77 +77 @@
 public class GpxLayer extends Layer {
     public GpxData data;
-    private final GpxLayer me;
     protected static final double PHI = Math.toRadians(15);
     private boolean computeCacheInSync;
@@ -86 +85 @@
     private boolean isLocalFile;
 
+    private final List<GpxTrack> lastTracks = new ArrayList<GpxTrack>(); // List of tracks at last paint
+    private int lastUpdateCount;
+
     private static class Markers {
         public boolean timedMarkersOmitted = false;
@@ -94 +96 @@
         super((String) d.attr.get("name"));
         data = d;
-        me = this;
         computeCacheInSync = false;
     }
@@ -207 +208 @@
 
                 MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", getName()),
-                        getAssociatedFile(), me);
+                        getAssociatedFile(), GpxLayer.this);
                 if (ml.data.size() > 0) {
                     Main.main.addLayer(ml);
@@ -282 +283 @@
                     }
                     MarkerLayer ml = new MarkerLayer(new GpxData(), tr("Audio markers from {0}", getName()) + names,
-                            getAssociatedFile(), me);
+                            getAssociatedFile(), GpxLayer.this);
                     double firstStartTime = sel[0].lastModified() / 1000.0 /* ms -> seconds */
                     - AudioUtil.getCalibratedDuration(sel[0]);
@@ -452 +453 @@
     }
 
+    private int sumUpdateCount() {
+        int updateCount = 0;
+        for (GpxTrack track: data.tracks) {
+            updateCount += track.getUpdateCount();
+        }
+        return updateCount;
+    }
+
+    @Override
+    public boolean isChanged() {
+        if (data.tracks.equals(lastTracks))
+            return sumUpdateCount() != lastUpdateCount;
+        else
+            return true;
+    }
+
     @Override
     public void mergeFrom(Layer from) {
@@ -481 +498 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds box) {
+        lastUpdateCount = sumUpdateCount();
+        lastTracks.clear();
+        lastTracks.addAll(data.tracks);
 
         /****************************************************************