Replace interface DataDisplayFrameSupplier by more reusable interface Plotable

Author: Stefan Hahmann

src/main/java/org/mastodon/mamut/views/grapher/DataDisplayFrameSupplier.java

@@ -41,6 +41,7 @@
 import org.mastodon.views.grapher.display.FeatureGraphConfig;
 import org.mastodon.views.grapher.display.FeatureSpecPair;
 import org.mastodon.views.grapher.display.GrapherSidePanel;
+import org.mastodon.views.grapher.display.Plotable;
 import org.mastodon.views.grapher.display.ScreenTransformState;
 
 public class GrapherGuiState
@@ -118,10 +119,10 @@ private GrapherGuiState()
 		loadGuiState( guiState, screenTransformState, sidePanel, defaultConfig, null );
 	}
 
-	static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
+	public static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
 			loadGuiState( final Map< String, Object > guiState, final ScreenTransformState screenTransformState,
 					final GrapherSidePanel sidePanel, final FeatureGraphConfig defaultConfig,
-					final DataDisplayFrameSupplier< V, E > frameSupplier )
+					final Plotable plotable )
 	{
 		// Read Screen Transform.
 		final ScreenTransform screenTransform = ( ScreenTransform ) guiState.get( GRAPHER_TRANSFORM_KEY );
@@ -133,8 +134,8 @@ private GrapherGuiState()
 		sidePanel.setGraphConfig( config );
 
 		// Plot with loaded transform and config.
-		if ( frameSupplier != null )
-			frameSupplier.getFrame().plot( screenTransform );
+		if ( plotable != null )
+			plotable.plot( screenTransform );
 	}
 
 	private static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void

src/main/java/org/mastodon/mamut/views/grapher/GrapherGuiState.java

@@ -57,7 +57,7 @@
 import java.util.function.BiConsumer;
 
 public class MamutBranchViewGrapher extends MamutBranchView< DataGraph< BranchSpot, BranchLink >, DataVertex, DataEdge >
-		implements HasColoringModel, HasColorBarOverlay, DataDisplayFrameSupplier< BranchSpot, BranchLink >
+		implements HasColoringModel, HasColorBarOverlay
 {
 
 	private final GrapherInitializer< BranchSpot, BranchLink > grapherInitializer;

src/main/java/org/mastodon/mamut/views/grapher/MamutBranchViewGrapher.java

@@ -66,7 +66,7 @@ public void restoreGuiState( final MamutBranchViewGrapher view, final Map< Strin
 		super.restoreGuiState( view, guiState );
 		DataDisplayFrame< BranchSpot, BranchLink > frame = view.getFrame();
 		GrapherGuiState.loadGuiState( guiState, frame.getDataDisplayPanel().getScreenTransform(), frame.getVertexSidePanel(),
-				MamutBranchViewGrapher.getFeatureGraphConfig(), view );
+				MamutBranchViewGrapher.getFeatureGraphConfig(), view.getFrame() );
 	}
 
 	@Override

src/main/java/org/mastodon/mamut/views/grapher/MamutBranchViewGrapherFactory.java

@@ -59,7 +59,7 @@
 import net.imglib2.loops.LoopBuilder;
 
 public class MamutViewGrapher extends MamutView< DataGraph< Spot, Link >, DataVertex, DataEdge >
-		implements HasContextChooser< Spot >, HasColoringModel, HasColorBarOverlay, DataDisplayFrameSupplier< Spot, Link >
+		implements HasContextChooser< Spot >, HasColoringModel, HasColorBarOverlay
 {
 
 	private final GrapherInitializer< Spot, Link > grapherInitializer;

src/main/java/org/mastodon/mamut/views/grapher/MamutViewGrapher.java

@@ -98,7 +98,7 @@ public void restoreGuiState( final MamutViewGrapher view, final Map< String, Obj
 		super.restoreGuiState( view, guiState );
 		DataDisplayFrame< Spot, Link > frame = view.getFrame();
 		GrapherGuiState.loadGuiState( guiState, frame.getDataDisplayPanel().getScreenTransform(), frame.getVertexSidePanel(),
-				MamutViewGrapher.getFeatureGraphConfig(), view );
+				MamutViewGrapher.getFeatureGraphConfig(), view.getFrame() );
 	}
 
 	@Override

src/main/java/org/mastodon/mamut/views/grapher/MamutViewGrapherFactory.java

@@ -63,7 +63,7 @@
 import org.mastodon.views.grapher.datagraph.ScreenTransform;
 import org.scijava.ui.behaviour.MouseAndKeyHandler;
 
-public class DataDisplayFrame< V extends Vertex< E > & HasTimepoint & HasLabel, E extends Edge< V > > extends ViewFrame
+public class DataDisplayFrame< V extends Vertex< E > & HasTimepoint & HasLabel, E extends Edge< V > > extends ViewFrame implements Plotable
 {
 	private static final long serialVersionUID = 1L;
 

src/main/java/org/mastodon/views/grapher/display/DataDisplayFrame.java

@@ -0,0 +1,8 @@
+package org.mastodon.views.grapher.display;
+
+import org.mastodon.views.grapher.datagraph.ScreenTransform;
+
+public interface Plotable
+{
+	void plot( final ScreenTransform screenTransform );
+}