Graphs are listening to selection and display settings changes.

Live update on the graphs!
Useful to inspect the data in regard to numerical features.

Author: tinevez

src/main/java/fiji/plugin/trackmate/features/EdgeCollectionDataset.java

@@ -60,8 +60,6 @@ public class EdgeCollectionDataset extends ModelDataset
 
 	private final List< DefaultWeightedEdge > edges;
 
-	private final FeatureColorGenerator< DefaultWeightedEdge > edgeColorGenerator;
-
 	private final Map< Integer, Set< DefaultWeightedEdge > > edgeMap;
 
 	private final Function< DefaultWeightedEdge, String > labelGenerator;
@@ -76,7 +74,6 @@ public EdgeCollectionDataset(
 	{
 		super( model, selectionModel, ds, xFeature, yFeatures );
 		this.edges = edges;
-		this.edgeColorGenerator = FeatureUtils.createTrackColorGenerator( model, ds );
 		this.edgeMap = createEdgeMap( edges, model.getTrackModel() );
 		this.labelGenerator = edge -> String.format( "%s → %s",
 				model.getTrackModel().getEdgeSource( edge ).getName(), model.getTrackModel().getEdgeTarget( edge ).getName() );
@@ -220,6 +217,8 @@ public Paint getItemPaint( final int series, final int item )
 			final DefaultWeightedEdge edge = edges.get( item );
 			if ( selectionModel != null && selectionModel.getEdgeSelection().contains( edge ) )
 				return ds.getHighlightColor();
+
+			final FeatureColorGenerator< DefaultWeightedEdge > edgeColorGenerator = FeatureUtils.createTrackColorGenerator( model, ds );
 			return edgeColorGenerator.color( edges.get( item ) );
 		}
 

src/main/java/fiji/plugin/trackmate/features/ModelDataset.java

@@ -75,6 +75,14 @@ public ModelDataset(
 		this.featureNameMap = new HashMap<>();
 		for ( int i = 0; i < yFeatures.size(); i++ )
 			featureNameMap.put( getSeriesKey( i ).toString(), Integer.valueOf( i ) );
+
+		// Listen to selection changes.
+		if ( selectionModel != null )
+			selectionModel.addSelectionChangeListener( l -> fireDatasetChanged() );
+
+		// Listen to changes in display settings.
+		if ( ds != null )
+			ds.listeners().add( () -> fireDatasetChanged() );
 	}
 
 	public String getXFeature()

src/main/java/fiji/plugin/trackmate/features/SpotCollectionDataset.java

@@ -58,8 +58,6 @@ public class SpotCollectionDataset extends ModelDataset implements XYDataset
 
 	private final List< Spot > spots;
 
-	private final FeatureColorGenerator< Spot > spotColorGenerator;
-
 	private final Map< Integer, Set< DefaultWeightedEdge > > edgeMap;
 
 	public SpotCollectionDataset(
@@ -72,7 +70,6 @@ public SpotCollectionDataset(
 	{
 		super( model, selectionModel, ds, xFeature, yFeatures );
 		this.spots = spots;
-		this.spotColorGenerator = FeatureUtils.createSpotColorGenerator( model, ds );
 		this.edgeMap = createEdgeMap( spots, model.getTrackModel() );
 	}
 
@@ -218,6 +215,8 @@ public Paint getItemPaint( final int series, final int item )
 			final Spot spot = spots.get( item );
 			if ( selectionModel != null && selectionModel.getSpotSelection().contains( spot ) )
 				return ds.getHighlightColor();
+
+			final FeatureColorGenerator< Spot > spotColorGenerator = FeatureUtils.createSpotColorGenerator( model, ds );
 			return spotColorGenerator.color( spots.get( item ) );
 		}
 

src/main/java/fiji/plugin/trackmate/features/TrackCollectionDataset.java

@@ -42,8 +42,6 @@ public class TrackCollectionDataset extends ModelDataset
 
 	private final List< Integer > trackIDs;
 
-	private final FeatureColorGenerator< Integer > trackColorGenerator;
-
 	public TrackCollectionDataset(
 			final Model model,
 			final SelectionModel selectionModel,
@@ -54,7 +52,6 @@ public TrackCollectionDataset(
 	{
 		super( model, selectionModel, ds, xFeature, yFeatures );
 		this.trackIDs = trackIDs;
-		this.trackColorGenerator = FeatureUtils.createWholeTrackColorGenerator( model, ds );
 	}
 
 	@Override
@@ -117,6 +114,8 @@ public Paint getItemPaint( final int series, final int item )
 			final Integer trackID = trackIDs.get( item );
 			if ( selectionModel != null && selectionModel.getSpotSelection().containsAll( model.getTrackModel().trackSpots( trackID ) ) )
 				return ds.getHighlightColor();
+
+			final FeatureColorGenerator< Integer > trackColorGenerator = FeatureUtils.createWholeTrackColorGenerator( model, ds );
 			return trackColorGenerator.color( trackIDs.get( item ) );
 		}