Line connecting dots on graphs can now be disabled.

Fix #186

Author: tinevez

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

@@ -70,11 +70,12 @@ public EdgeCollectionDataset(
 			final DisplaySettings ds,
 			final String xFeature,
 			final List< String > yFeatures,
-			final List< DefaultWeightedEdge > edges )
+			final List< DefaultWeightedEdge > edges,
+			final boolean addLines )
 	{
 		super( model, selectionModel, ds, xFeature, yFeatures );
 		this.edges = edges;
-		this.edgeMap = createEdgeMap( edges, model.getTrackModel() );
+		this.edgeMap = addLines ? createEdgeMap( edges, model.getTrackModel() ) : null;
 		this.labelGenerator = edge -> String.format( "%s → %s",
 				model.getTrackModel().getEdgeSource( edge ).getName(), model.getTrackModel().getEdgeTarget( edge ).getName() );
 	}
@@ -170,7 +171,7 @@ protected void drawPrimaryLine(
 				final ValueAxis rangeAxis,
 				final Rectangle2D dataArea )
 		{
-			if ( !edgeMap.containsKey( Integer.valueOf( item ) ) )
+			if ( edgeMap == null || !edgeMap.containsKey( Integer.valueOf( item ) ) )
 				return;
 
 			final RectangleEdge xAxisLocation = plot.getDomainAxisEdge();

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

@@ -40,13 +40,16 @@ public class EdgeFeatureGrapher extends AbstractFeatureGrapher
 
 	private final DisplaySettings ds;
 
+	private final boolean addLines;
+
 	public EdgeFeatureGrapher(
 			final List< DefaultWeightedEdge > edges,
 			final String xFeature,
 			final List< String > yFeatures,
 			final Model model,
 			final SelectionModel selectionModel,
-			final DisplaySettings displaySettings )
+			final DisplaySettings displaySettings,
+			final boolean addLines )
 	{
 		super(
 				xFeature,
@@ -60,6 +63,7 @@ public EdgeFeatureGrapher(
 		this.model = model;
 		this.selectionModel = selectionModel;
 		this.ds = displaySettings;
+		this.addLines = addLines;
 	}
 
 	@Override
@@ -71,6 +75,7 @@ protected ModelDataset buildMainDataSet( final List< String > targetYFeatures )
 				ds,
 				xFeature,
 				targetYFeatures,
-				edges );
+				edges,
+				addLines );
 	}
 }

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

@@ -66,11 +66,12 @@ public SpotCollectionDataset(
 			final DisplaySettings ds,
 			final String xFeature,
 			final List< String > yFeatures,
-			final List< Spot > spots )
+			final List< Spot > spots,
+			final boolean addLines )
 	{
 		super( model, selectionModel, ds, xFeature, yFeatures );
 		this.spots = spots;
-		this.edgeMap = createEdgeMap( spots, model.getTrackModel() );
+		this.edgeMap = addLines ? createEdgeMap( spots, model.getTrackModel() ) : null;
 	}
 
 	/**
@@ -166,7 +167,7 @@ protected void drawPrimaryLine(
 				final ValueAxis rangeAxis,
 				final Rectangle2D dataArea )
 		{
-			if ( !edgeMap.containsKey( Integer.valueOf( item ) ) )
+			if ( edgeMap == null || !edgeMap.containsKey( Integer.valueOf( item ) ) )
 				return;
 
 			final RectangleEdge xAxisLocation = plot.getDomainAxisEdge();

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

@@ -39,13 +39,16 @@ public class SpotFeatureGrapher extends AbstractFeatureGrapher
 
 	private final DisplaySettings ds;
 
+	private final boolean addLines;
+
 	public SpotFeatureGrapher(
 			final List< Spot > spots,
 			final String xFeature,
 			final List< String > yFeatures,
 			final Model model,
 			final SelectionModel selectionModel,
-			final DisplaySettings displaySettings )
+			final DisplaySettings displaySettings,
+			final boolean addLines )
 	{
 		super(
 				xFeature,
@@ -59,6 +62,7 @@ public SpotFeatureGrapher(
 		this.model = model;
 		this.selectionModel = selectionModel;
 		this.ds = displaySettings;
+		this.addLines = addLines;
 	}
 
 	@Override
@@ -70,6 +74,7 @@ protected ModelDataset buildMainDataSet( final List< String > targetYFeatures )
 				ds,
 				xFeature,
 				targetYFeatures,
-				spots );
+				spots,
+				addLines );
 	}
 }

src/main/java/fiji/plugin/trackmate/gui/components/GrapherPanel.java

@@ -32,11 +32,14 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
+import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
+import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
@@ -87,6 +90,8 @@ public class GrapherPanel extends JPanel
 
 	private final JRadioButton rdbtnTracks;
 
+	private final JCheckBox chkboxConnectDots;
+
 	/*
 	 * CONSTRUCTOR
 	 */
@@ -149,6 +154,7 @@ public GrapherPanel( final TrackMate trackmate, final SelectionModel selectionMo
 		panelTracks.add( trackFeatureSelectionPanel );
 
 		panelSelection = new JPanel();
+		panelSelection.setLayout( new BoxLayout( panelSelection, BoxLayout.LINE_AXIS ) );
 		add( panelSelection, BorderLayout.SOUTH );
 
 		rdbtnAll = new JRadioButton( "All" );
@@ -168,6 +174,13 @@ public GrapherPanel( final TrackMate trackmate, final SelectionModel selectionMo
 		btngrp.add( rdbtnSelection );
 		btngrp.add( rdbtnTracks );
 		rdbtnAll.setSelected( true );
+
+		panelSelection.add( new JSeparator( SwingConstants.VERTICAL ) );
+
+		chkboxConnectDots = new JCheckBox( "Connect" );
+		chkboxConnectDots.setFont( chkboxConnectDots.getFont().deriveFont( chkboxConnectDots.getFont().getSize() - 2f ) );
+		chkboxConnectDots.setSelected( true );
+		panelSelection.add( chkboxConnectDots );
 	}
 
 	public FeaturePlotSelectionPanel getSpotFeatureSelectionPanel()
@@ -209,14 +222,16 @@ else if ( rdbtnSelection.isSelected() )
 						selectionModel.getEdgeSelection(), 0 );
 				spots = new ArrayList<>( selectionModel.getSpotSelection() );
 			}
+			final boolean addLines = chkboxConnectDots.isSelected();
 
 			final SpotFeatureGrapher grapher = new SpotFeatureGrapher(
 					spots,
 					xFeature,
 					yFeatures,
 					trackmate.getModel(),
 					selectionModel,
-					displaySettings );
+					displaySettings,
+					addLines );
 			final JFrame frame = grapher.render();
 			frame.setIconImage( Icons.PLOT_ICON.getImage() );
 			frame.setTitle( trackmate.getSettings().imp.getShortTitle() + " spot features" );
@@ -253,14 +268,16 @@ else if ( rdbtnSelection.isSelected() )
 						selectionModel.getEdgeSelection(), 0 );
 				edges = new ArrayList<>( selectionModel.getEdgeSelection() );
 			}
+			final boolean addLines = chkboxConnectDots.isSelected();
 
 			final EdgeFeatureGrapher grapher = new EdgeFeatureGrapher(
 					edges,
 					xFeature,
 					yFeatures,
 					trackmate.getModel(),
 					selectionModel,
-					displaySettings );
+					displaySettings,
+					addLines );
 			final JFrame frame = grapher.render();
 			frame.setIconImage( Icons.PLOT_ICON.getImage() );
 			frame.setTitle( trackmate.getSettings().imp.getShortTitle() + " edge features" );

src/test/java/fiji/plugin/trackmate/interactivetests/SpotFeatureGrapherExample.java

@@ -67,7 +67,8 @@ public static void main( final String[] args )
 				Y,
 				model,
 				selectionModel,
-				DisplaySettings.defaultStyle().copy() );
+				DisplaySettings.defaultStyle().copy(),
+				true );
 		final JFrame frame = grapher.render();
 		frame.setLocationRelativeTo( null );
 		frame.setVisible( true );