From 1700eeedd0ae89831f9c64f545076db31874075e Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:23:09 -0700 Subject: [PATCH 1/9] remove unused imports --- .../lightsheetmanager/gui/tabs/channels/ChannelTableModel.java | 1 - .../model/acquisitions/AcquisitionEngineScape.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTableModel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTableModel.java index fd5ccf75..9100a983 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTableModel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTableModel.java @@ -5,7 +5,6 @@ import javax.swing.table.AbstractTableModel; import java.util.Objects; -import java.util.function.Consumer; public class ChannelTableModel extends AbstractTableModel { diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java index 3c2315c4..fd66d10a 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineScape.java @@ -17,7 +17,6 @@ import org.micromanager.data.Datastore; import org.micromanager.data.SummaryMetadata; import org.micromanager.data.internal.DefaultDatastore; -import org.micromanager.data.internal.DefaultSummaryMetadata; import org.micromanager.data.internal.PropertyKey; import org.micromanager.display.DataViewer; import org.micromanager.display.DataViewerListener; From df88e48488140fe0125b554172824749221d9c58 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:24:12 -0700 Subject: [PATCH 2/9] fix the playlist name javadocs and two typos --- .../gui/playlist/AcquisitionTableFrame.java | 2 +- .../model/playlist/AcquisitionTableData.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/playlist/AcquisitionTableFrame.java b/src/main/java/org/micromanager/lightsheetmanager/gui/playlist/AcquisitionTableFrame.java index 947caccb..aef93326 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/playlist/AcquisitionTableFrame.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/playlist/AcquisitionTableFrame.java @@ -577,7 +577,7 @@ private void setupAcquisitionAndRun(final AcquisitionMetadata data) { // final List metadata = // acqTable_.getTableData().getMetadataList(); // -// // run each aquisition in sequence +// // run each acquisition in sequence // int acqIndex = 0; // boolean allAcqsDone = false; // while (!allAcqsDone) { diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/playlist/AcquisitionTableData.java b/src/main/java/org/micromanager/lightsheetmanager/model/playlist/AcquisitionTableData.java index f159579f..d5770f93 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/playlist/AcquisitionTableData.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/playlist/AcquisitionTableData.java @@ -166,9 +166,9 @@ public void renamePositionList(final String oldName, final String newName) { } /** - * Returns an unordered array of all position list names. + * Returns an unordered array of all acquisition settings names. * - * @return an unordered array of all position list names + * @return an unordered array of all acquisition settings names */ public String[] getAcquisitionNames() { final Set keys = settings_.keySet(); @@ -185,9 +185,9 @@ public String[] getAcquisitionNames() { // } /** - * Returns array of all acquisition settings names. + * Returns array of all position list names. * - * @return an array of all acquisition settings names. + * @return an array of all position list names. */ public String[] getPositionListNames() { final Set keys = positions_.keySet(); @@ -272,7 +272,7 @@ public PositionList getPositionList(final String name) { /** * Sets the positionListName in the metadata, used when selecting values - * with the AcquistionTablePositionList. + * with the AcquisitionTablePositionList. * * @param row the selected row * @param name the new name From 97b2ffba130c1ee082622d6aa29e9675b6985105 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:25:19 -0700 Subject: [PATCH 3/9] complete the javadoc of the scan acceleration --- .../lightsheetmanager/model/utils/StageScanUtils.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/utils/StageScanUtils.java b/src/main/java/org/micromanager/lightsheetmanager/model/utils/StageScanUtils.java index 580f3bef..d9009810 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/utils/StageScanUtils.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/utils/StageScanUtils.java @@ -36,8 +36,10 @@ public static int computeScanChannelsPerPass(final ScapeAcquisitionSettings sett * Compute appropriate acceleration time in ms for the specified motor speed. * Set to be 10ms + 0-100ms depending on relative speed to max, all scaled by factor specified on the settings panel * - * @param motorSpeed - * @return + * @param motorSpeed the scan speed in mm/s + * @param maxMotorSpeed the maximum speed of the stage in mm/s + * @param stageScanAccelFactor the factor specified on the settings panel + * @return the acceleration time in ms */ public static double computeScanAcceleration(final double motorSpeed, final double maxMotorSpeed, final double stageScanAccelFactor) { return (10 + 100 * (motorSpeed / maxMotorSpeed)) * stageScanAccelFactor; From 5d1169ce4b02be1d90bb4dcb6f5bec21d748f923 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:26:36 -0700 Subject: [PATCH 4/9] add a tooltip to the binning on the cameras tab --- .../org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java index e903a42e..020ceaf3 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java @@ -55,6 +55,7 @@ private void createUserInterface() { final Panel pnlBinning = new Panel("Binning"); cmbBinning_ = new ComboBox<>(new String[0], null, 80, 20); + cmbBinning_.setToolTipText("Set the binning of every active imaging camera."); lblBinningState_ = new JLabel(" "); pnlBinning.add(new JLabel("Active imaging cameras:"), "wrap"); From 6574e5caa99322e90af6f680bb046d241c955c8c Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:28:33 -0700 Subject: [PATCH 5/9] add a tooltip to the save file name --- .../lightsheetmanager/gui/tabs/acquisition/SavePanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java index 7628d61d..de43b3f6 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SavePanel.java @@ -202,7 +202,8 @@ public void createEventHandlers() { txtSaveFileName_.registerValidationListener(BaseAcquisitionSettings::saveNamePrefixProblem, problem -> { - txtSaveFileName_.setToolTipText(problem); + txtSaveFileName_.setToolTipText( + problem == null ? "Name for the saved images." : problem); if (problem == null) { model_.acquisitions().settingsBuilder() .saveNamePrefix(txtSaveFileName_.getText()); From d350407fbff08ef3ad67857b184edba2f178e53b Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:30:05 -0700 Subject: [PATCH 6/9] add tooltips to the channel group and channel mode --- .../gui/tabs/channels/ChannelTablePanel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java index ec5a9c85..38e39529 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java @@ -81,6 +81,10 @@ private void createUserInterface() { lastChannelMode_ = ChannelMode.VOLUME; } cmbChannelMode_ = new ComboBox<>(ChannelMode.values(), lastChannelMode_, 140, 22); + cmbChannelGroup_.setToolTipText( + "Micro-Manager configuration group the channel presets come from."); + cmbChannelMode_.setToolTipText("How often the channel changes, and whether the " + + "software or the controller switches it."); add(lblChannelGroup_, "split 2"); add(cmbChannelGroup_, "wrap"); From 0c15415f8a1e82573d695aebac29aaf00fa473aa Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:40:35 -0700 Subject: [PATCH 7/9] add a tooltip to the primary camera buttons --- .../lightsheetmanager/gui/components/RadioButton.java | 6 ++++++ .../lightsheetmanager/gui/tabs/acquisition/CameraPanel.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/components/RadioButton.java b/src/main/java/org/micromanager/lightsheetmanager/gui/components/RadioButton.java index d8d3b818..88599952 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/components/RadioButton.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/components/RadioButton.java @@ -49,6 +49,12 @@ public void setEnabled(final boolean state) { button.setEnabled(state); } } + + public void setToolTipText(final String text) { + for (final JRadioButton button : buttons) { + button.setToolTipText(text); + } + } private void addRadioButton(final String text) { final JRadioButton button = new JRadioButton(text); final Font font = new Font(Font.SANS_SERIF, Font.PLAIN, 12); diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/CameraPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/CameraPanel.java index 2580135d..32d08fb7 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/CameraPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/CameraPanel.java @@ -72,6 +72,8 @@ private void createUserInterface() { // simultaneous camera settings radPrimaryCamera_ = new RadioButton(cameraNames, primaryCamera, RadioButton.VERTICAL); + radPrimaryCamera_.setToolTipText("The first camera in the acquisition. " + + "Live mode shows this camera and the slice timing is computed from it."); // active check boxes final Panel pnlCheckboxes = new Panel(); From 6b31c40fd0cd3cbb21781f138a57a16de5ca1d7d Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:43:06 -0700 Subject: [PATCH 8/9] add tooltips to the pause and playlist buttons --- .../lightsheetmanager/gui/tabs/AcquisitionTab.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java index 84fc7a1a..fc5c9768 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java @@ -167,6 +167,9 @@ private void createUserInterface() { + "or stop the running one."); btnTestAcquisition_.setToolTipText( "Run one time point with the current settings, without saving the images."); + btnPauseAcquisition_.setToolTipText("Pause or resume the running acquisition."); + btnOpenPlaylist_.setToolTipText( + "Open the playlist to run a sequence of acquisitions."); final boolean channelsEnabled = settings.channels().enabled(); cbxUseChannels_ = new CheckBox("Channels", channelsEnabled); From 57493c4917ddc257f37dfaddca09baf743dc18e9 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 30 Oct 2026 13:48:43 -0700 Subject: [PATCH 9/9] add a tooltip to the post-move delay --- .../lightsheetmanager/gui/tabs/acquisition/PositionPanel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/PositionPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/PositionPanel.java index b1b04ffb..798f26fd 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/PositionPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/PositionPanel.java @@ -44,6 +44,8 @@ private void createUserInterface() { btnEditPositionList_ = new Button("Edit Position List...", 130, 24); btnOpenXYZGrid_ = new Button("XYZ Grid...", 90, 24); btnEditPositionList_.setToolTipText("Open the Micro-Manager position list editor."); + spnPostMoveDelay_.setToolTipText( + "Time to wait after moving to each position before acquiring there."); add(btnEditPositionList_, ""); add(btnOpenXYZGrid_, "wrap");