Changeset 12157 in josm

Timestamp:

2017-05-15T14:41:08+02:00 (7 years ago)

Author:

michael2402

Message:

See #13124: Refresh the heat map on every invalidation (visible tacks changed, ...)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (8 diffs)
• src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java (modified) (11 diffs)
• test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import java.text.DateFormat;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
 
 import javax.swing.Action;
@@ -20 +17 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.SaveActionBase;
@@ -28 +24 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
@@ -66 +61 @@
     public boolean[] trackVisibility = new boolean[0];
 
-    private final GpxDrawHelper drawHelper;
-
     /**
      * Constructs a new {@code GpxLayer} without name.
@@ -95 +88 @@
         data = d;
         data.addWeakChangeListener(e -> this.invalidate());
-        drawHelper = new GpxDrawHelper(data);
-        SystemOfMeasurement.addSoMChangeListener(drawHelper);
-        ensureTrackVisibilityLength();
+        trackVisibility = new boolean[data.getTracks().size()];
+        Arrays.fill(trackVisibility, true);
         setName(name);
         isLocalFile = isLocal;
@@ -280 +272 @@
             throw new IllegalArgumentException("not a GpxLayer: " + from);
         data.mergeFrom(((GpxLayer) from).data);
-        drawHelper.dataChanged();
-    }
-
-    @Override
-    public void paint(Graphics2D g, MapView mv, Bounds box) {
-        List<WayPoint> visibleSegments = listVisibleSegments(box);
-        if (!visibleSegments.isEmpty()) {
-            drawHelper.readPreferences(getName());
-            drawHelper.drawAll(g, mv, visibleSegments);
-            if (Main.getLayerManager().getActiveLayer() == this) {
-                drawHelper.drawColorBar(g, mv);
-            }
-        }
-    }
-
-    private List<WayPoint> listVisibleSegments(Bounds box) {
-        WayPoint last = null;
-        LinkedList<WayPoint> visibleSegments = new LinkedList<>();
-
-        ensureTrackVisibilityLength();
-        for (Collection<WayPoint> segment : data.getLinesIterable(trackVisibility)) {
-
-            for (WayPoint pt : segment) {
-                Bounds b = new Bounds(pt.getCoor());
-                if (pt.drawLine && last != null) {
-                    b.extend(last.getCoor());
-                }
-                if (b.intersects(box)) {
-                    if (last != null && (visibleSegments.isEmpty()
-                            || visibleSegments.getLast() != last)) {
-                        if (last.drawLine) {
-                            WayPoint l = new WayPoint(last);
-                            l.drawLine = false;
-                            visibleSegments.add(l);
-                        } else {
-                            visibleSegments.add(last);
-                        }
-                    }
-                    visibleSegments.add(pt);
-                }
-                last = pt;
-            }
-        }
-        return visibleSegments;
+        invalidate();
     }
 
@@ -339 +288 @@
     public void setAssociatedFile(File file) {
         data.storageFile = file;
-    }
-
-    /** ensures the trackVisibility array has the correct length without losing data.
-     * additional entries are initialized to true;
-     */
-    private void ensureTrackVisibilityLength() {
-        final int l = data.getTracks().size();
-        if (l == trackVisibility.length)
-            return;
-        final int m = Math.min(l, trackVisibility.length);
-        trackVisibility = Arrays.copyOf(trackVisibility, l);
-        for (int i = m; i < l; i++) {
-            trackVisibility[i] = true;
-        }
-        invalidate();
     }
 
@@ -383 +317 @@
 
     @Override
-    public synchronized void destroy() {
-        super.destroy();
-        SystemOfMeasurement.removeSoMChangeListener(drawHelper);
+    public void paint(Graphics2D g, MapView mv, Bounds bbox) {
+        // unused - we use a painter so this is not called.
+    }
+
+    @Override
+    protected LayerPainter createMapViewPainter(MapViewEvent event) {
+        return new GpxDrawHelper(this);
     }
 }

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -27 +27 @@
 import java.util.Collections;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
@@ -33 +34 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
 import org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener;
@@ -42 +44 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.MapViewGraphics;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.MapViewEvent;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationEvent;
+import org.openstreetmap.josm.gui.layer.MapViewPaintable.PaintableInvalidationListener;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.ColorScale;
@@ -51 +59 @@
  * @since 7319
  */
-public class GpxDrawHelper implements SoMChangeListener {
+public class GpxDrawHelper implements SoMChangeListener, MapViewPaintable.LayerPainter, PaintableInvalidationListener {
 
     /**
@@ -60 +68 @@
 
     private final GpxData data;
+    private final GpxLayer layer;
 
     // draw lines between points belonging to different segments
@@ -167 +176 @@
     private Color[] heatMapLutColor = createColorLut(0, Color.BLACK, Color.WHITE);
 
+    // The heat map was invalidated since the last draw.
+    private boolean gpxLayerInvalidated;
+
+
     private void setupColors() {
         hdopAlpha = Main.pref.getInteger("hdop.color.alpha", -1);
@@ -204 +217 @@
     /**
      * Constructs a new {@code GpxDrawHelper}.
-     * @param gpxData GPX data
-     * @since 11713
-     */
-    public GpxDrawHelper(GpxData gpxData) {
-        data = gpxData;
+     * @param gpxLayer The layer to draw
+     * @since 12157
+     */
+    public GpxDrawHelper(GpxLayer gpxLayer) {
+        layer = gpxLayer;
+        data = gpxLayer.data;
+
+        layer.addInvalidationListener(this);
+        SystemOfMeasurement.addSoMChangeListener(this);
         setupColors();
     }
@@ -301 +318 @@
 
         largesize += lineWidth;
+    }
+
+    @Override
+    public void paint(MapViewGraphics graphics) {
+        List<WayPoint> visibleSegments = listVisibleSegments(graphics.getClipBounds().getLatLonBoundsBox());
+        if (!visibleSegments.isEmpty()) {
+            readPreferences(layer.getName());
+            drawAll(graphics.getDefaultGraphics(), graphics.getMapView(), visibleSegments);
+            if (graphics.getMapView().getLayerManager().getActiveLayer() == layer) {
+                drawColorBar(graphics.getDefaultGraphics(), graphics.getMapView());
+            }
+        }
+    }
+
+    private List<WayPoint> listVisibleSegments(Bounds box) {
+        WayPoint last = null;
+        LinkedList<WayPoint> visibleSegments = new LinkedList<>();
+
+        ensureTrackVisibilityLength();
+        for (Collection<WayPoint> segment : data.getLinesIterable(layer.trackVisibility)) {
+
+            for (WayPoint pt : segment) {
+                Bounds b = new Bounds(pt.getCoor());
+                if (pt.drawLine && last != null) {
+                    b.extend(last.getCoor());
+                }
+                if (b.intersects(box)) {
+                    if (last != null && (visibleSegments.isEmpty()
+                            || visibleSegments.getLast() != last)) {
+                        if (last.drawLine) {
+                            WayPoint l = new WayPoint(last);
+                            l.drawLine = false;
+                            visibleSegments.add(l);
+                        } else {
+                            visibleSegments.add(last);
+                        }
+                    }
+                    visibleSegments.add(pt);
+                }
+                last = pt;
+            }
+        }
+        return visibleSegments;
+    }
+
+    /** ensures the trackVisibility array has the correct length without losing data.
+     * TODO: Make this nicer by syncing the trackVisibility automatically.
+     * additional entries are initialized to true;
+     */
+    private void ensureTrackVisibilityLength() {
+        final int l = data.getTracks().size();
+        if (l == layer.trackVisibility.length)
+            return;
+        final int m = Math.min(l, layer.trackVisibility.length);
+        layer.trackVisibility = Arrays.copyOf(layer.trackVisibility, l);
+        for (int i = m; i < l; i++) {
+            layer.trackVisibility[i] = true;
+        }
     }
 
@@ -1203 +1278 @@
 
         // recalculation of image needed
-        final boolean imageRecalc = !mapViewState.equalsInWindow(heatMapMapViewState) ||
-                                    heatMapCacheLineWith != globalLineWidth;
+        final boolean imageRecalc = !mapViewState.equalsInWindow(heatMapMapViewState)
+                || gpxLayerInvalidated
+                || heatMapCacheLineWith != globalLineWidth;
 
         // need re-generation of gray image ?
@@ -1228 +1304 @@
             heatMapMapViewState = mapViewState;
             heatMapCacheLineWith = globalLineWidth;
+            gpxLayerInvalidated = false;
         }
 
@@ -1402 +1479 @@
         }
     }
+
+    @Override
+    public void paintableInvalidated(PaintableInvalidationEvent event) {
+        gpxLayerInvalidated = true;
+    }
+
+    @Override
+    public void detachFromMapView(MapViewEvent event) {
+        SystemOfMeasurement.removeSoMChangeListener(this);
+        layer.removeInvalidationListener(this);
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java

@@ -15 +15 @@
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.io.GpxReaderTest;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -123 +124 @@
     static List<String> calculateColors(String fileName, String layerName, int n) throws IOException, SAXException {
         final GpxData data = GpxReaderTest.parseGpxData(fileName);
-        final GpxDrawHelper gdh = new GpxDrawHelper(data);
+        final GpxLayer layer = new GpxLayer(data);
+        final GpxDrawHelper gdh = new GpxDrawHelper(layer);
         gdh.readPreferences(layerName);
         gdh.calculateColors();