Skip to content

Mode the Displaysettings config in the Preferences dialog and clean duplicate code #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tinevez merged 11 commits into from
Aug 8, 2026
Merged

Mode the Displaysettings config in the Preferences dialog and clean duplicate code #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ffabce4
Let DisplaySettings implements Style< DisplaySettings >
tinevez Aug 5, 2026
cb3b4d5
Refactor the DisplaySettingsPanel
tinevez Aug 5, 2026
2a0603d
DisplaySettingsIO has methods to write / read specified files.
tinevez Aug 5, 2026
aa1d049
A SelectAndEditProfileSettingsPage for DisplaySettings.
tinevez Aug 5, 2026
01e14e4
The DisplaySettingsManager can be set to modify a specific instance.
tinevez Aug 5, 2026
eb2d182
The GuiModel has a DisplaySettingsManager,
tinevez Aug 5, 2026
68b56cf
Add the display settings config page to the preferences.
tinevez Aug 5, 2026
22f03c4
Remove the old tool to configure display settings.
tinevez Aug 6, 2026
815a300
In the wizard, make spots visible when filtering them if they are inv…
tinevez Aug 6, 2026
320b724
Remove the TrackMate style element classes and resources.
tinevez Aug 6, 2026
e7c4186
Depend on config-ui 0.0.1
tinevez Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@
(https://github.com/scijava/scijava-coding-style) -->
<scijava.coding-style>imglib2</scijava.coding-style>

<fontchooser.version>2.5.2</fontchooser.version>
<javaGeom.version>0.11.1</javaGeom.version>
<imglib2.version>8.0.0</imglib2.version>
<bigdataviewer-core.version>10.6.7</bigdataviewer-core.version>
Expand All @@ -201,7 +200,7 @@
<dependency>
<groupId>org.scijava</groupId>
<artifactId>config-ui</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.1</version>
</dependency>

<!-- Logging dependencies -->
Expand Down Expand Up @@ -391,11 +390,6 @@
<artifactId>javaGeom</artifactId>
<version>${javaGeom.version}</version>
</dependency>
<dependency>
<groupId>org.drjekyll</groupId>
<artifactId>fontchooser</artifactId>
<version>${fontchooser.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/fiji/plugin/trackmate/action/closegaps/CloseGapsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@
import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;

import org.scijava.ui.config.visitors.gui.elements.SliderPanelDouble;
import org.scijava.ui.config.visitors.gui.elements.StyleElements;
import org.scijava.ui.config.visitors.gui.elements.StyleElements.BoundedDoubleElement;

import fiji.plugin.trackmate.action.closegaps.GapClosingMethod.GapClosingParameter;
import fiji.plugin.trackmate.gui.Fonts;
import fiji.plugin.trackmate.gui.displaysettings.SliderPanelDouble;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.BoundedDoubleElement;

/**
* A basic UI to let a TrackMate user choose between several techniques for gap
Expand Down
17 changes: 9 additions & 8 deletions src/main/java/fiji/plugin/trackmate/action/meshtools/MeshSmootherPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,15 @@
import javax.swing.JRadioButton;
import javax.swing.JTabbedPane;

import fiji.plugin.trackmate.gui.displaysettings.SliderPanel;
import fiji.plugin.trackmate.gui.displaysettings.SliderPanelDouble;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.BoundedDoubleElement;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.EnumElement;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.IntElement;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.StyleElement;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.StyleElementVisitor;
import org.scijava.ui.config.visitors.gui.elements.SliderPanel;
import org.scijava.ui.config.visitors.gui.elements.SliderPanelDouble;
import org.scijava.ui.config.visitors.gui.elements.StyleElement;
import org.scijava.ui.config.visitors.gui.elements.StyleElementVisitor;
import org.scijava.ui.config.visitors.gui.elements.StyleElements;
import org.scijava.ui.config.visitors.gui.elements.StyleElements.BoundedDoubleElement;
import org.scijava.ui.config.visitors.gui.elements.StyleElements.EnumElement;
import org.scijava.ui.config.visitors.gui.elements.StyleElements.IntElement;

import net.imglib2.mesh.alg.TaubinSmoothing.TaubinWeightType;

public class MeshSmootherPanel extends JPanel
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/fiji/plugin/trackmate/gui/GuiModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import fiji.plugin.trackmate.Settings;
import fiji.plugin.trackmate.TrackMate;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettings;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettingsManager;
import fiji.plugin.trackmate.gui.editor.labkit.component.EditorKeymapManager;
import fiji.plugin.trackmate.util.TMUtils;
import fiji.plugin.trackmate.visualization.hyperstack.behaviours.semiautotracking.SemiAutoTrackingParams;
Expand Down Expand Up @@ -53,6 +54,8 @@ public class GuiModel

private final WindowManager windowManager;

private final DisplaySettingsManager dsManager;

/**
* Creates a new GuiModel.
*
Expand Down Expand Up @@ -83,6 +86,9 @@ public GuiModel( final Model model, final Settings settings, final DisplaySettin
this.globalActions = new Actions( keymapManager.getForwardSelectedKeymap().getConfig(), KeyConfigContexts.TRACKMATE );
TrackMateActions.install( globalActions, model, selectionModel );

// Other managers
this.dsManager = new DisplaySettingsManager( displaySettings, true );

// Window manager
this.windowManager = new WindowManager( this );
}
Expand Down Expand Up @@ -243,4 +249,9 @@ public SemiAutoTrackingParams getSemiAutoTrackingParams()
{
return semiAutoTrackingparams;
}

public DisplaySettingsManager getDisplaySettingsManager()
{
return dsManager;
}
}
4 changes: 3 additions & 1 deletion src/main/java/fiji/plugin/trackmate/gui/WindowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import bdv.ui.keymap.KeymapSettingsPage;
import bdv.util.InvokeOnEDT;
import bvv.vistools.BvvHandle;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettingsConfigPage;
import fiji.plugin.trackmate.gui.editor.LabkitLauncher;
import fiji.plugin.trackmate.gui.editor.labkit.component.TMLabKitFrame;
import fiji.plugin.trackmate.util.TMUtils;
Expand Down Expand Up @@ -68,9 +69,10 @@ public WindowManager( final GuiModel guiModel )
preferencesDialog.setTitle( "TrackMate Preferences" );
preferencesDialog.setLocationRelativeTo( null );
BigDataViewerActions.toggleDialogAction( globalActions, preferencesDialog, BigDataViewerActions.PREFERENCES_DIALOG, BigDataViewerActions.PREFERENCES_DIALOG_KEYS );
preferencesDialog.addPage( new SpotEditToolSettingsPage( "Semi-auto tracking", guiModel.getSemiAutoTrackingParams() ) );
preferencesDialog.addPage( new DisplaySettingsConfigPage( "Display settings", guiModel.getDisplaySettingsManager() ) );
preferencesDialog.addPage( new KeymapSettingsPage( "Global keymap", keymapManager, keymapManager.getCommandDescriptions() ) );
preferencesDialog.addPage( new KeymapSettingsPage( "Editor keymap", guiModel.getEditorKeymapManager(), guiModel.getEditorKeymapManager().getCommandDescriptions() ) );
preferencesDialog.addPage( new SpotEditToolSettingsPage( "Semi-auto tracking", guiModel.getSemiAutoTrackingParams() ) );
preferencesDialog.addPage( new AppearanceSettingsPage( "Editor appearance", guiModel.getAppearanceManager() ) );
}

Expand Down
26 changes: 1 addition & 25 deletions src/main/java/fiji/plugin/trackmate/gui/components/ConfigureViewsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import static fiji.plugin.trackmate.gui.Fonts.FONT;
import static fiji.plugin.trackmate.gui.Fonts.SMALL_FONT;
import static fiji.plugin.trackmate.gui.Icons.BVV_ICON;
import static fiji.plugin.trackmate.gui.Icons.EDIT_SETTINGS_ICON;
import static fiji.plugin.trackmate.gui.Icons.SPOT_TABLE_ICON;
import static fiji.plugin.trackmate.gui.Icons.TRACK_SCHEME_ICON_16x16;
import static fiji.plugin.trackmate.gui.Icons.TRACK_TABLES_ICON;
Expand All @@ -46,7 +45,6 @@
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JFormattedTextField;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRootPane;
Expand All @@ -61,7 +59,6 @@
import fiji.plugin.trackmate.gui.GuiUtils;
import fiji.plugin.trackmate.gui.Icons;
import fiji.plugin.trackmate.gui.WindowManager;
import fiji.plugin.trackmate.gui.displaysettings.ConfigTrackMateDisplaySettings;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettings;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettings.TrackDisplayMode;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettings.UpdateListener;
Expand Down Expand Up @@ -97,6 +94,7 @@ public ConfigureViewsPanel( final GuiModel guiModel, final FeatureDisplaySelecto
{
this.guiModel = guiModel;
this.windowManager = guiModel.getWindowManager();
final DisplaySettings ds = guiModel.getDisplaySettings();
this.setPreferredSize( new Dimension( 300, 521 ) );
this.setSize( 300, 500 );

Expand All @@ -121,28 +119,6 @@ public ConfigureViewsPanel( final GuiModel guiModel, final FeatureDisplaySelecto
gbcLabelDisplayOptions.gridy = 0;
add( lblDisplayOptions, gbcLabelDisplayOptions );

/*
* Settings editor.
*/

final DisplaySettings ds = guiModel.getDisplaySettings();
final JFrame editor = ConfigTrackMateDisplaySettings.editor( ds,
"Configure the display settings used in this current session.",
"TrackMate display settings" );
editor.setLocationRelativeTo( this.getParent() );
editor.setDefaultCloseOperation( JFrame.HIDE_ON_CLOSE );

final JButton btnEditSettings = new JButton( "Edit settings", EDIT_SETTINGS_ICON );
btnEditSettings.addActionListener( e -> editor.setVisible( !editor.isVisible() ) );

final GridBagConstraints gbcBtnEditSettings = new GridBagConstraints();
gbcBtnEditSettings.fill = GridBagConstraints.NONE;
gbcBtnEditSettings.insets = new Insets( 5, 5, 5, 5 );
gbcBtnEditSettings.anchor = GridBagConstraints.EAST;
gbcBtnEditSettings.gridx = 1;
gbcBtnEditSettings.gridy = 0;
add( btnEditSettings, gbcBtnEditSettings );

/*
* Display spot checkbox.
*/
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/fiji/plugin/trackmate/gui/components/FeatureDisplaySelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
import javax.swing.JPopupMenu;
import javax.swing.SwingConstants;

import org.scijava.ui.config.visitors.gui.elements.colormap.Colormap;

import fiji.plugin.trackmate.Model;
import fiji.plugin.trackmate.ModelChangeEvent;
import fiji.plugin.trackmate.Settings;
Expand All @@ -67,7 +69,6 @@
import fiji.plugin.trackmate.features.manual.ManualSpotColorAnalyzerFactory;
import fiji.plugin.trackmate.features.track.TrackIndexAnalyzer;
import fiji.plugin.trackmate.gui.GuiUtils;
import fiji.plugin.trackmate.gui.displaysettings.Colormap;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettings;
import fiji.plugin.trackmate.gui.displaysettings.DisplaySettings.TrackMateObject;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fiji/plugin/trackmate/gui/components/PanelProbaThreshold.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
import javax.swing.JLabel;
import javax.swing.JPanel;

import fiji.plugin.trackmate.gui.displaysettings.SliderPanelDouble;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.BoundedDoubleElement;
import org.scijava.ui.config.visitors.gui.elements.SliderPanelDouble;
import org.scijava.ui.config.visitors.gui.elements.StyleElements;
import org.scijava.ui.config.visitors.gui.elements.StyleElements.BoundedDoubleElement;

/**
* A utility widget that lets a user specify a threshold on a probability value,
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/fiji/plugin/trackmate/gui/components/PanelSmoothContour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
import javax.swing.JLabel;
import javax.swing.JPanel;

import fiji.plugin.trackmate.gui.displaysettings.SliderPanelDouble;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements;
import fiji.plugin.trackmate.gui.displaysettings.StyleElements.BoundedDoubleElement;
import org.scijava.ui.config.visitors.gui.elements.SliderPanelDouble;
import org.scijava.ui.config.visitors.gui.elements.StyleElements;
import org.scijava.ui.config.visitors.gui.elements.StyleElements.BoundedDoubleElement;

public class PanelSmoothContour extends JPanel
{
Expand Down
97 changes: 0 additions & 97 deletions src/main/java/fiji/plugin/trackmate/gui/displaysettings/BoundedValue.java
View file
Open in desktop

This file was deleted.

Loading
Loading