Changeset 12156 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2017-05-15T14:14:40+02:00 (7 years ago)

Author:

michael2402

Message:

See #14120: Don't make gpx tracks depend on the isChanged method, use a listener based approach instead.

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (13 diffs)
• OsmDataLayer.java (modified) (1 diff)
• gpx/ChooseTrackVisibilityAction.java (modified) (2 diffs)
• gpx/ConvertToDataLayerAction.java (modified) (1 diff)
• gpx/MarkersFromNamedPointsAction.java (modified) (2 diffs)
• markerlayer/PlayHeadMarker.java (modified) (1 diff)

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

@@ -9 +9 @@
 import java.io.File;
 import java.text.DateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -60 +59 @@
     /**
      * used by {@link ChooseTrackVisibilityAction} to determine which tracks to show/hide
+     *
+     * Call {@link #invalidate()} after each change!
+     *
+     * TODO: Make it private, make it respond to track changes.
      */
     public boolean[] trackVisibility = new boolean[0];
-
-    private final List<GpxTrack> lastTracks = new ArrayList<>(); // List of tracks at last paint
-    private int lastUpdateCount;
 
     private final GpxDrawHelper drawHelper;
@@ -94 +94 @@
         super(d.getString(GpxConstants.META_NAME));
         data = d;
+        data.addWeakChangeListener(e -> this.invalidate());
         drawHelper = new GpxDrawHelper(data);
         SystemOfMeasurement.addSoMChangeListener(drawHelper);
@@ -151 +152 @@
         }
 
-        if (!data.tracks.isEmpty()) {
+        if (!data.getTracks().isEmpty()) {
             info.append("<table><thead align='center'><tr><td colspan='5'>")
                 .append(trn("{0} track", "{0} tracks", data.tracks.size(), data.tracks.size()))
@@ -159 +160 @@
                 .append("</td></tr></thead>");
 
-            for (GpxTrack trk : data.tracks) {
+            for (GpxTrack trk : data.getTracks()) {
                 info.append("<tr><td>");
                 if (trk.getAttributes().containsKey(GpxConstants.GPX_NAME)) {
@@ -182 +183 @@
 
         info.append(tr("Length: {0}", SystemOfMeasurement.getSystemOfMeasurement().getDistText(data.length()))).append("<br>")
-            .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size()))
-            .append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br></html>");
+            .append(trn("{0} route, ", "{0} routes, ", data.getRoutes().size(), data.getRoutes().size()))
+            .append(trn("{0} waypoint", "{0} waypoints", data.getWaypoints().size(), data.getWaypoints().size())).append("<br></html>");
 
         final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString()));
@@ -240 +241 @@
         }
 
-        info.append(trn("{0} track, ", "{0} tracks, ", data.tracks.size(), data.tracks.size()))
-            .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size()))
-            .append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("<br>")
+        info.append(trn("{0} track, ", "{0} tracks, ", data.getTracks().size(), data.getTracks().size()))
+            .append(trn("{0} route, ", "{0} routes, ", data.getRoutes().size(), data.getRoutes().size()))
+            .append(trn("{0} waypoint", "{0} waypoints", data.getWaypoints().size(), data.getWaypoints().size())).append("<br>")
             .append(tr("Length: {0}", SystemOfMeasurement.getSystemOfMeasurement().getDistText(data.length())))
             .append("<br></html>");
@@ -251 +252 @@
     public boolean isMergable(Layer other) {
         return other instanceof GpxLayer;
-    }
-
-    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;
     }
 
@@ -279 +264 @@
         long from = fromDate.getTime();
         long to = toDate.getTime();
-        for (GpxTrack trk : data.tracks) {
+        for (GpxTrack trk : data.getTracks()) {
             Date[] t = GpxData.getMinMaxTimeForTrack(trk);
 
@@ -287 +272 @@
             i++;
         }
+        invalidate();
     }
 
@@ -299 +285 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds box) {
-        lastUpdateCount = sumUpdateCount();
-        lastTracks.clear();
-        lastTracks.addAll(data.tracks);
-
         List<WayPoint> visibleSegments = listVisibleSegments(box);
         if (!visibleSegments.isEmpty()) {
@@ -363 +345 @@
      */
     private void ensureTrackVisibilityLength() {
-        final int l = data.tracks.size();
+        final int l = data.getTracks().size();
         if (l == trackVisibility.length)
             return;
@@ -371 +353 @@
             trackVisibility[i] = true;
         }
+        invalidate();
     }
 

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

@@ -743 +743 @@
             }
 
-            gpxData.tracks.add(new ImmutableGpxTrack(trk, trkAttr));
+            gpxData.addTrack(new ImmutableGpxTrack(trk, trkAttr));
         });
     }

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

@@ -218 +218 @@
             layer.trackVisibility[table.convertRowIndexToModel(i)] = s.isSelectedIndex(i);
         }
-        Main.map.mapView.preferenceChanged(null);
-        Main.map.repaint(100);
+        layer.invalidate();
     }
 
@@ -292 +291 @@
             layer.trackVisibility[table.convertRowIndexToModel(i)] = all || s.isSelectedIndex(i);
         }
+        // layer has been changed
+        layer.invalidate();
         // ...sync with layer visibility instead to avoid having two ways to hide everything
         layer.setVisible(v == 1 || !s.isSelectionEmpty());

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

@@ -74 +74 @@
         public DataSet convert() {
             final DataSet ds = new DataSet();
-            for (GpxTrack trk : layer.data.tracks) {
+            for (GpxTrack trk : layer.data.getTracks()) {
                 for (GpxTrackSegment segment : trk.getSegments()) {
                     List<Node> nodes = new ArrayList<>();

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

@@ -11 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
-import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
-import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -30 +27 @@
     public void actionPerformed(ActionEvent e) {
         GpxData namedTrackPoints = new GpxData();
-        for (GpxTrack track : layer.data.tracks) {
-            for (GpxTrackSegment seg : track.getSegments()) {
-                for (WayPoint point : seg.getWayPoints()) {
-                    if (point.attr.containsKey("name") || point.attr.containsKey("desc")) {
-                        namedTrackPoints.waypoints.add(point);
-                    }
-                }
-            }
-        }
+        layer.data.getTrackPoints()
+            .filter(point -> point.attr.containsKey("name") || point.attr.containsKey("desc"))
+            .forEach(namedTrackPoints.waypoints::add);
         MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer);
         if (!ml.data.isEmpty()) {

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -317 +317 @@
         WayPoint w2 = null;
 
-        for (GpxTrack track : trackLayer.data.tracks) {
+        for (GpxTrack track : trackLayer.data.getTracks()) {
             for (GpxTrackSegment trackseg : track.getSegments()) {
                 for (WayPoint w: trackseg.getWayPoints()) {