Merge pull request #368 from stefanhahmann/access-grapher-context-chooser

stefanhahmann · web-flow · commit 7708d2ff3862 · 2025-04-10T10:46:45.000+02:00
Access grapher context chooser in GrapherSidePanel from outside
diff --git a/src/main/java/org/mastodon/mamut/views/grapher/DataDisplayFrameSupplier.java b/src/main/java/org/mastodon/mamut/views/grapher/DataDisplayFrameSupplier.java
diff --git a/src/main/java/org/mastodon/mamut/views/grapher/GrapherGuiState.java b/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,11 @@
 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.Plotable;
+import org.mastodon.views.grapher.display.ScreenTransformState;
 
 public class GrapherGuiState
 {
@@ -100,40 +101,39 @@ 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<V, E> sidePanel, final FeatureGraphConfig defaultConfig,
+					final Plotable plotable )
 	{
-		DataDisplayFrame< V, E > frame = frameSupplier.getFrame();
-
 		// 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 ( plotable != null )
+			plotable.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 +150,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<V, E> 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,
@@ -165,7 +166,7 @@ private GrapherGuiState()
 		return new FeatureGraphConfig( featureSpecPairX, featureSpecPairY, FeatureGraphConfig.GraphDataItemsSource.CONTEXT, showEdges );
 	}
 
-	private static FeatureSpecPair loadFeatureSpecPair( final Map< String, Object > guiState, final GrapherSidePanel sidePanel,
+	private static < V extends Vertex< E >,  E extends Edge< V > > FeatureSpecPair loadFeatureSpecPair( final Map< String, Object > guiState, final GrapherSidePanel<V, E> sidePanel,
 			final String edgeKey, final String featureSpecKey, final String projectionKey, final String incomingEdgeKey )
 	{
 		Boolean isEdgeFeature = ( Boolean ) guiState.get( edgeKey );
diff --git a/src/main/java/org/mastodon/mamut/views/grapher/GrapherInitializer.java b/src/main/java/org/mastodon/mamut/views/grapher/GrapherInitializer.java
@@ -71,6 +71,7 @@
 import org.mastodon.ui.coloring.ColorBarOverlay;
 import org.mastodon.ui.coloring.ColoringModel;
 import org.mastodon.ui.coloring.GraphColorGeneratorAdapter;
+import org.mastodon.ui.commandfinder.CommandFinder;
 import org.mastodon.views.context.ContextChooser;
 import org.mastodon.views.grapher.datagraph.DataContextListener;
 import org.mastodon.views.grapher.datagraph.DataEdge;
@@ -275,6 +276,23 @@ void addSearchPanel( final Actions viewActions )
 		frame.getSettingsPanel().add( searchPanel );
 	}
 
+	void addCommandFinder(final Actions viewActions, final String[] keyConfigContexts)
+	{
+		final CommandFinder cf = CommandFinder.build()
+				.context( appModel.getContext() )
+				.inputTriggerConfig( appModel.getKeymap().getConfig() )
+				.keyConfigContexts( keyConfigContexts )
+				.descriptionProvider( appModel.getWindowManager().getViewFactories().getCommandDescriptions() )
+				.register( viewActions )
+				.register( appModel.getModelActions() )
+				.register( appModel.getProjectActions() )
+				.register( appModel.getPlugins().getPluginActions() )
+				.modificationListeners( appModel.getKeymap().updateListeners() )
+				.parent( frame )
+				.installOn( viewActions );
+		cf.getDialog().setTitle( cf.getDialog().getTitle() + " - " + frame.getTitle() );
+	}
+
 	private void
 			registerColoring(
 					final TriFunction< ViewMenuBuilder.JMenuHandle, GraphColorGeneratorAdapter< V, E, DataVertex, DataEdge >,
diff --git a/src/main/java/org/mastodon/mamut/views/grapher/MamutBranchViewGrapher.java b/src/main/java/org/mastodon/mamut/views/grapher/MamutBranchViewGrapher.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;
@@ -82,6 +82,7 @@ public class MamutBranchViewGrapher extends MamutBranchView< DataGraph< BranchSp
 		setFrame( grapherInitializer.getFrame() ); // this creates viewActions and viewBehaviours thus must be called before installActions
 		grapherInitializer.installActions( viewActions, viewBehaviours );
 		grapherInitializer.addSearchPanel( viewActions );
+		grapherInitializer.addCommandFinder( viewActions, keyConfigContexts );
 
 		TriFunction< JMenuHandle, GraphColorGeneratorAdapter< BranchSpot, BranchLink, DataVertex, DataEdge >,
 				DataDisplayPanel< BranchSpot, BranchLink >, ColoringModel > colorModelRegistration =
diff --git a/src/main/java/org/mastodon/mamut/views/grapher/MamutBranchViewGrapherFactory.java b/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.getFrame() );
 	}
 
 	@Override
diff --git a/src/main/java/org/mastodon/mamut/views/grapher/MamutViewGrapher.java b/src/main/java/org/mastodon/mamut/views/grapher/MamutViewGrapher.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;
@@ -83,6 +83,7 @@ public class MamutViewGrapher extends MamutView< DataGraph< Spot, Link >, DataVe
 		setFrame( grapherInitializer.getFrame() ); // this creates viewActions and viewBehaviours thus must be called before installActions
 		grapherInitializer.installActions( viewActions, viewBehaviours );
 		grapherInitializer.addSearchPanel( viewActions );
+		grapherInitializer.addCommandFinder( viewActions, keyConfigContexts );
 
 		final TriFunction< ViewMenuBuilder.JMenuHandle, GraphColorGeneratorAdapter< Spot, Link, DataVertex, DataEdge >,
 				DataDisplayPanel< Spot, Link >, ColoringModel > colorModelRegistration = ( menuHandle, coloringAdaptor,
@@ -95,20 +96,6 @@ public class MamutViewGrapher extends MamutView< DataGraph< Spot, Link >, DataVe
 		grapherInitializer.addMenusAndRegisterColors( colorModelRegistration, colorBarRegistration, tagSetMenuRegistration,
 				keyConfigContexts );
 		grapherInitializer.layout();
-
-		final CommandFinder cf = CommandFinder.build()
-				.context( appModel.getContext() )
-				.inputTriggerConfig( appModel.getKeymap().getConfig() )
-				.keyConfigContexts( keyConfigContexts )
-				.descriptionProvider( appModel.getWindowManager().getViewFactories().getCommandDescriptions() )
-				.register( viewActions )
-				.register( appModel.getModelActions() )
-				.register( appModel.getProjectActions() )
-				.register( appModel.getPlugins().getPluginActions() )
-				.modificationListeners( appModel.getKeymap().updateListeners() )
-				.parent( frame )
-				.installOn( viewActions );
-		cf.getDialog().setTitle( cf.getDialog().getTitle() + " - " + frame.getTitle() );
 	}
 
 	static FeatureGraphConfig getFeatureGraphConfig()
diff --git a/src/main/java/org/mastodon/mamut/views/grapher/MamutViewGrapherFactory.java b/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.getFrame() );
 	}
 
 	@Override
diff --git a/src/main/java/org/mastodon/views/grapher/display/DataDisplayFrame.java b/src/main/java/org/mastodon/views/grapher/display/DataDisplayFrame.java
@@ -63,13 +63,13 @@
 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;
 
 	private final DataDisplayPanel< V, E > dataDisplayPanel;
 
-	private final GrapherSidePanel sidePanel;
+	private final GrapherSidePanel<V, E> sidePanel;
 
 	private final FeatureModel featureModel;
 
@@ -116,7 +116,7 @@ public DataDisplayFrame(
 		 * Side panel.
 		 */
 
-		sidePanel = new GrapherSidePanel( nSources, contextChooser );
+		sidePanel = new GrapherSidePanel<>( nSources, contextChooser );
 		sidePanel.getBtnPlot().addActionListener( e -> plot( false ) );
 
 		final FeatureModelListener featureModelListener = () -> sidePanel.setFeatures(
@@ -183,7 +183,7 @@ public DataDisplayPanel< V, E > getDataDisplayPanel()
 		return dataDisplayPanel;
 	}
 
-	public GrapherSidePanel getVertexSidePanel()
+	public GrapherSidePanel<V, E> getVertexSidePanel()
 	{
 		return sidePanel;
 	}
@@ -194,8 +194,10 @@ public GrapherSidePanel getVertexSidePanel()
 	 */
 	public void plot( boolean keepCurrentScreenTransform )
 	{
-		dataDisplayPanel.plot( sidePanel.getGraphConfig(), featureModel,
-				keepCurrentScreenTransform ? dataDisplayPanel.getScreenTransform().get() : null );
+		if ( keepCurrentScreenTransform )
+			plot( dataDisplayPanel.getScreenTransform().get() );
+		else
+			plot( null );
 	}
 
 	public void plot( final ScreenTransform transform )
diff --git a/src/main/java/org/mastodon/views/grapher/display/GrapherSidePanel.java b/src/main/java/org/mastodon/views/grapher/display/GrapherSidePanel.java
diff --git a/src/main/java/org/mastodon/views/grapher/display/Plotable.java b/src/main/java/org/mastodon/views/grapher/display/Plotable.java
