Make methods GrapherGuiState.writeGuiState() and GrapherGuiState.loadGuiState() public

Author: Stefan Hahmann

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

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -38,10 +38,10 @@
 import org.mastodon.model.HasLabel;
 import org.mastodon.spatial.HasTimepoint;
 import org.mastodon.views.grapher.datagraph.ScreenTransform;
-import org.mastodon.views.grapher.display.DataDisplayFrame;
 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.ScreenTransformState;
 
 public class GrapherGuiState
 {
@@ -100,40 +100,46 @@ private GrapherGuiState()
 	 */
 	public static final String GRAPHER_SHOW_EDGES_KEY = "GrapherShowEdges";
 
-	static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
-			writeGuiState( final DataDisplayFrameSupplier< V, E > frameProvider, final Map< String, Object > guiState )
+	public static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
+			writeGuiState( final ScreenTransformState screenTransformState, final FeatureGraphConfig config,
+					final Map< String, Object > guiState )
 	{
-		DataDisplayFrame< V, E > frame = frameProvider.getFrame();
 		// Transform.
-		final ScreenTransform transform = frame.getDataDisplayPanel().getScreenTransform().get();
+		final ScreenTransform transform = screenTransformState.get();
 		guiState.put( GRAPHER_TRANSFORM_KEY, transform );
 		// Feature graph config.
-		writeFeatureGraphConfig( frame, guiState );
+		writeFeatureGraphConfig( config, guiState );
 	}
 
-	static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
-			loadGuiState( final DataDisplayFrameSupplier< V, E > frameSupplier, final Map< String, Object > guiState,
-					final FeatureGraphConfig defaultConfig )
+	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 )
 	{
-		DataDisplayFrame< V, E > frame = frameSupplier.getFrame();
+		loadGuiState( guiState, screenTransformState, sidePanel, defaultConfig, null );
+	}
 
+	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 )
+	{
 		// Read Screen Transform.
 		final ScreenTransform screenTransform = ( ScreenTransform ) guiState.get( GRAPHER_TRANSFORM_KEY );
 		if ( null != screenTransform )
-			frame.getDataDisplayPanel().getScreenTransform().set( screenTransform );
+			screenTransformState.set( screenTransform );
 
 		// Read Feature graph config.
-		FeatureGraphConfig config = loadFeatureGraphConfig( frame, guiState, defaultConfig );
-		frame.getVertexSidePanel().setGraphConfig( config );
+		FeatureGraphConfig config = loadFeatureGraphConfig( sidePanel, guiState, defaultConfig );
+		sidePanel.setGraphConfig( config );
 
 		// Plot with loaded transform and config.
-		frame.plot( screenTransform );
+		if ( frameSupplier != null )
+			frameSupplier.getFrame().plot( screenTransform );
 	}
 
 	private static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > void
-			writeFeatureGraphConfig( final DataDisplayFrame< V, E > frame, final Map< String, Object > guiState )
+			writeFeatureGraphConfig( final FeatureGraphConfig config, final Map< String, Object > guiState )
 	{
-		FeatureGraphConfig config = frame.getVertexSidePanel().getGraphConfig();
 		// X-axis feature.
 		FeatureSpecPair featureSpecPairX = config.getXFeature();
 		guiState.put( GRAPHER_X_AXIS_FEATURE_IS_EDGE_KEY, featureSpecPairX.isEdgeFeature() );
@@ -150,11 +156,12 @@ private GrapherGuiState()
 		guiState.put( GRAPHER_SHOW_EDGES_KEY, config.drawConnected() );
 	}
 
-	private static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > FeatureGraphConfig
-			loadFeatureGraphConfig( final DataDisplayFrame< V, E > frame, final Map< String, Object > guiState,
-					final FeatureGraphConfig defaultConfig )
+	public static < V extends Vertex< E > & HasTimepoint & HasLabel & Ref< V >, E extends Edge< V > & Ref< E > > FeatureGraphConfig
+			loadFeatureGraphConfig(
+					final GrapherSidePanel sidePanel, final Map< String, Object > guiState,
+					final FeatureGraphConfig defaultConfig
+			)
 	{
-		GrapherSidePanel sidePanel = frame.getVertexSidePanel();
 		FeatureSpecPair featureSpecPairX = loadFeatureSpecPair( guiState, sidePanel, GRAPHER_X_AXIS_FEATURE_IS_EDGE_KEY,
 				GRAPHER_X_AXIS_FEATURE_SPEC_KEY, GRAPHER_X_AXIS_FEATURE_PROJECTION_KEY, GRAPHER_X_AXIS_INCOMING_EDGE_KEY );
 		FeatureSpecPair featureSpecPairY = loadFeatureSpecPair( guiState, sidePanel, GRAPHER_Y_AXIS_FEATURE_IS_EDGE_KEY,

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

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,8 +31,11 @@
 import java.util.Map;
 
 import org.mastodon.mamut.ProjectModel;
+import org.mastodon.mamut.model.branch.BranchLink;
+import org.mastodon.mamut.model.branch.BranchSpot;
 import org.mastodon.mamut.views.AbstractMamutViewFactory;
 import org.mastodon.mamut.views.MamutViewFactory;
+import org.mastodon.views.grapher.display.DataDisplayFrame;
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 
@@ -51,15 +54,19 @@ public MamutBranchViewGrapher create( final ProjectModel projectModel )
 	public Map< String, Object > getGuiState( final MamutBranchViewGrapher view )
 	{
 		final Map< String, Object > guiState = super.getGuiState( view );
-		GrapherGuiState.writeGuiState( view, guiState );
+		DataDisplayFrame< BranchSpot, BranchLink > frame = view.getFrame();
+		GrapherGuiState.writeGuiState( frame.getDataDisplayPanel().getScreenTransform(), frame.getVertexSidePanel().getGraphConfig(),
+				guiState );
 		return guiState;
 	}
 
 	@Override
 	public void restoreGuiState( final MamutBranchViewGrapher view, final Map< String, Object > guiState )
 	{
 		super.restoreGuiState( view, guiState );
-		GrapherGuiState.loadGuiState( view, guiState, MamutBranchViewGrapher.getFeatureGraphConfig() );
+		DataDisplayFrame< BranchSpot, BranchLink > frame = view.getFrame();
+		GrapherGuiState.loadGuiState( guiState, frame.getDataDisplayPanel().getScreenTransform(), frame.getVertexSidePanel(),
+				MamutBranchViewGrapher.getFeatureGraphConfig(), view );
 	}
 
 	@Override

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

@@ -6,13 +6,13 @@
  * %%
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,9 +31,12 @@
 import java.util.Map;
 
 import org.mastodon.mamut.ProjectModel;
+import org.mastodon.mamut.model.Link;
+import org.mastodon.mamut.model.Spot;
 import org.mastodon.mamut.views.AbstractMamutViewFactory;
 import org.mastodon.mamut.views.MamutViewFactory;
 import org.mastodon.ui.coloring.ColorBarOverlay.Position;
+import org.mastodon.views.grapher.display.DataDisplayFrame;
 import org.scijava.Priority;
 import org.scijava.plugin.Plugin;
 
@@ -82,7 +85,9 @@ public MamutViewGrapher create( final ProjectModel projectModel )
 	public Map< String, Object > getGuiState( final MamutViewGrapher view )
 	{
 		final Map< String, Object > guiState = super.getGuiState( view );
-		GrapherGuiState.writeGuiState( view, guiState );
+		DataDisplayFrame< Spot, Link > frame = view.getFrame();
+		GrapherGuiState.writeGuiState( frame.getDataDisplayPanel().getScreenTransform(), frame.getVertexSidePanel().getGraphConfig(),
+				guiState );
 		return guiState;
 	}
 
@@ -91,7 +96,9 @@ public Map< String, Object > getGuiState( final MamutViewGrapher view )
 	public void restoreGuiState( final MamutViewGrapher view, final Map< String, Object > guiState )
 	{
 		super.restoreGuiState( view, guiState );
-		GrapherGuiState.loadGuiState( view, guiState, MamutViewGrapher.getFeatureGraphConfig() );
+		DataDisplayFrame< Spot, Link > frame = view.getFrame();
+		GrapherGuiState.loadGuiState( guiState, frame.getDataDisplayPanel().getScreenTransform(), frame.getVertexSidePanel(),
+				MamutViewGrapher.getFeatureGraphConfig(), view );
 	}
 
 	@Override