From c4eba3dbab9f52c5fa87f4c781d755c72320fa7c Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 23 Jul 2026 09:34:48 -0700 Subject: [PATCH 1/2] widen LightSheetEventAdapter to accept AcquisitionSettings Every member it touches (numTimePoints, timePointInterval, channels, volume().slicesPerView) is already on the common interface, so this drops the SCAPE-only constraint with no body changes. Prep for wiring diSPIM to the same adapter (separate follow-up, needs more work). Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_016Sokv3obu7Toneq2jGh9gv --- .../model/acquisitions/LightSheetEventAdapter.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java index 0f233ccf..3887421d 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/LightSheetEventAdapter.java @@ -7,7 +7,6 @@ import org.micromanager.acqj.main.AcquisitionEvent; import org.micromanager.acqj.util.AcquisitionEventIterator; import org.micromanager.lightsheetmanager.api.AcquisitionSettings; -import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings; import org.micromanager.lightsheetmanager.model.channels.ChannelSpec; import java.util.ArrayList; @@ -39,7 +38,7 @@ private LightSheetEventAdapter() { } public static Iterator createTimelapseMultiChannelVolumeAcqEvents( - AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings, + AcquisitionEvent baseEvent, AcquisitionSettings settings, String[] cameraDeviceNames, Function eventMonitor) { @@ -70,7 +69,7 @@ public static Iterator createTimelapseMultiChannelVolumeAcqEve } public static Iterator createTimelapseVolumeAcqEvents( - AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings, + AcquisitionEvent baseEvent, AcquisitionSettings settings, String[] cameraDeviceNames, Function eventMonitor) { @@ -99,7 +98,7 @@ public static Iterator createTimelapseVolumeAcqEvents( * false: do an entire volume in one channel, then the next one */ public static Iterator createMultiChannelVolumeAcqEvents( - AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings, + AcquisitionEvent baseEvent, AcquisitionSettings settings, String[] cameraDeviceNames, Function eventMonitor, boolean interleaved) { @@ -125,7 +124,7 @@ public static Iterator createMultiChannelVolumeAcqEvents( } public static Iterator createVolumeAcqEvents( - AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings, + AcquisitionEvent baseEvent, AcquisitionSettings settings, String[] cameraDeviceNames, Function eventMonitor) { @@ -141,7 +140,7 @@ public static Iterator createVolumeAcqEvents( } public static Iterator createChannelAcqEvents( - AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings, + AcquisitionEvent baseEvent, AcquisitionSettings settings, String[] cameraDeviceNames, Function eventMonitor) { @@ -161,7 +160,7 @@ public static Iterator createChannelAcqEvents( } public static Iterator createAcqEvents( - AcquisitionEvent baseEvent, ScapeAcquisitionSettings settings, + AcquisitionEvent baseEvent, AcquisitionSettings settings, String[] cameraDeviceNames, Function eventMonitor) { From c19bff34127c2e30a86d3e4419e3c8b55e8c5806 Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 24 Jul 2026 00:19:18 -0700 Subject: [PATCH 2/2] remove Label class and replace with JLabel --- .../LightSheetManagerFrame.java | 12 +++-- .../gui/components/Label.java | 54 ------------------- .../gui/tabs/AutofocusTab.java | 49 ++++++++--------- .../lightsheetmanager/gui/tabs/CameraTab.java | 15 +++--- .../gui/tabs/SetupPathTab.java | 7 +-- .../tabs/acquisition/AdvancedTimingPanel.java | 36 ++++++------- .../gui/tabs/acquisition/DurationPanel.java | 21 ++++---- .../gui/tabs/acquisition/PositionPanel.java | 8 +-- .../gui/tabs/acquisition/SlicePanel.java | 28 +++++----- .../gui/tabs/acquisition/TimePointsPanel.java | 12 ++--- .../gui/tabs/acquisition/VolumePanel.java | 16 +++--- 11 files changed, 104 insertions(+), 154 deletions(-) delete mode 100644 src/main/java/org/micromanager/lightsheetmanager/gui/components/Label.java diff --git a/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerFrame.java b/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerFrame.java index f5a63b45..57fd3135 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerFrame.java +++ b/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerFrame.java @@ -2,15 +2,15 @@ import net.miginfocom.swing.MigLayout; +import org.micromanager.internal.utils.WindowPositioning; import org.micromanager.lightsheetmanager.api.data.GeometryType; import org.micromanager.lightsheetmanager.api.data.LightSheetType; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.data.Icons; import org.micromanager.lightsheetmanager.gui.tabs.TabPanel; import org.micromanager.lightsheetmanager.gui.utils.WindowUtils; -import org.micromanager.internal.utils.WindowPositioning; import javax.swing.JFrame; +import javax.swing.JLabel; import java.awt.Font; import java.util.Objects; @@ -85,8 +85,10 @@ private void createErrorUserInterface() { "[]10[]" )); - final Label lblTitle = new Label(LightSheetManagerPlugin.menuName, Font.BOLD, 16); - final Label lblError = new Label(model_.setupErrorMessage(), Font.BOLD, 14); + final JLabel lblTitle = new JLabel(LightSheetManagerPlugin.menuName); + lblTitle.setFont(new Font(Font.SANS_SERIF, Font.BOLD, 16)); + final JLabel lblError = new JLabel(model_.setupErrorMessage()); + lblError.setFont(new Font(Font.SANS_SERIF, Font.BOLD, 14)); add(lblTitle, "wrap"); add(lblError, ""); @@ -108,7 +110,7 @@ private void createUserInterface() { final int height = 680; tabPanel_ = new TabPanel(model_, this, width, height); - final Label lblTitle = new Label(LightSheetManagerPlugin.menuName, Font.BOLD, 20); + final JLabel lblTitle = new JLabel(LightSheetManagerPlugin.menuName); lblTitle.setFont(new Font(Font.MONOSPACED, Font.BOLD, 20)); // restore the polling state from settings diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/components/Label.java b/src/main/java/org/micromanager/lightsheetmanager/gui/components/Label.java deleted file mode 100644 index 50868d80..00000000 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/components/Label.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.micromanager.lightsheetmanager.gui.components; - -import javax.swing.JLabel; - -import java.awt.Color; -import java.awt.Font; - -public class Label extends JLabel { - - private static Color defaultTextColor = Color.WHITE; - - private static int defaultFontSize = 12; - private static int defaultFontStyle = Font.PLAIN; - private static String defaultFontFamily = Font.SANS_SERIF; - - public Label(final String text) { - super(text); - setForeground(defaultTextColor); - setFont(new Font(defaultFontFamily, defaultFontStyle, defaultFontSize)); - } - - public Label(final String text, final int size) { - super(text); - setForeground(defaultTextColor); - setFont(new Font(defaultFontFamily, defaultFontStyle, size)); - } - - public Label(final String text, final int style, final int size) { - super(text); - setForeground(defaultTextColor); - setFont(new Font(defaultFontFamily, style, size)); - } - - public Label(final String text, final String name, final int style, final int size) { - super(text); - setForeground(defaultTextColor); - setFont(new Font(name, style, size)); - } - - public void setDefaultTextColor(final Color color) { - defaultTextColor = color; - } - public void setDefaultFontSize(final int size) { - defaultFontSize = size; - } - - public void setDefaultFontStyle(final int style) { - defaultFontStyle = style; - } - - public void setDefaultFontFamily(final String name) { - defaultFontFamily = name; - } -} diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java index b83f553b..8ecf402b 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AutofocusTab.java @@ -1,17 +1,17 @@ package org.micromanager.lightsheetmanager.gui.tabs; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.data.AutofocusMode; import org.micromanager.lightsheetmanager.api.data.AutofocusType; import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings; -import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.gui.components.Button; import org.micromanager.lightsheetmanager.gui.components.CheckBox; import org.micromanager.lightsheetmanager.gui.components.ComboBox; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.ListeningPanel; import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.gui.components.Spinner; +import javax.swing.JLabel; import java.awt.Font; import java.util.Objects; @@ -38,8 +38,8 @@ public class AutofocusTab extends Panel implements ListeningPanel { private Spinner spnMaxOffset_; // autofocus options during setup - private Label lblMaxOffsetSetup_; - private Label lblMaxOffsetSetupUm_; + private JLabel lblMaxOffsetSetup_; + private JLabel lblMaxOffsetSetupUm_; private Spinner spnMaxOffsetSetup_; private CheckBox cbxAutoUpdateFocusFound_; @@ -55,7 +55,8 @@ public void createUserInterface() { final ScapeAcquisitionSettings acqSettings = model_.acquisitions().settings(); - final Label lblTitle = new Label("Autofocus Settings", Font.BOLD, 18); + final JLabel lblTitle = new JLabel("Autofocus Settings"); + lblTitle.setFont(new Font(Font.SANS_SERIF, Font.BOLD, 18)); setMigLayout( "", @@ -71,11 +72,11 @@ public void createUserInterface() { final Panel pnlMoveCorrection = new Panel("Movement Correction Options"); // general autofocus options - final Label lblNumImages = new Label("Number of Images:"); - final Label lblStepSizeUm = new Label("Step Size [µm]:"); - final Label lblMode = new Label("Mode:"); - final Label lblScoringAlgorithm = new Label("Scoring algorithm:"); - // final Label lblToleranceUm = new Label("Tolerance [µm]"); + final JLabel lblNumImages = new JLabel("Number of Images:"); + final JLabel lblStepSizeUm = new JLabel("Step Size [µm]:"); + final JLabel lblMode = new JLabel("Mode:"); + final JLabel lblScoringAlgorithm = new JLabel("Scoring algorithm:"); + // final JLabel lblToleranceUm = new JLabel("Tolerance [µm]"); cbxShowImages_ = new CheckBox("Show Images", 12, acqSettings.autofocus().showImages(), CheckBox.RIGHT); @@ -98,10 +99,10 @@ public void createUserInterface() { btnRunAutofocus_.setEnabled(false); // FIXME: impl autofocus // autofocus options during acquisition - final Label lblTimePoints = new Label("time points"); - final Label lblMaxOffsetActive = new Label("Max offset change: "); - final Label lblAutofocusEveryX = new Label("Autofocus every "); - final Label lblAutofocusChannel = new Label("Autofocus channel:"); + final JLabel lblTimePoints = new JLabel("time points"); + final JLabel lblMaxOffsetActive = new JLabel("Max offset change: "); + final JLabel lblAutofocusEveryX = new JLabel("Autofocus every "); + final JLabel lblAutofocusChannel = new JLabel("Autofocus channel:"); cbxAutofocusEveryPass_ = new CheckBox("Autofocus every stage pass", 12, false, CheckBox.RIGHT); cbxAutofocusBeforeAcq_ = new CheckBox("Autofocus before starting acquisition", 12, false, CheckBox.RIGHT); @@ -111,18 +112,18 @@ public void createUserInterface() { spnMaxOffset_ = Spinner.createIntegerSpinner(3, 0, 10, 1); // autofocus options during setup - lblMaxOffsetSetup_ = new Label("Max offset change: "); - lblMaxOffsetSetupUm_ = new Label("µm (±)"); + lblMaxOffsetSetup_ = new JLabel("Max offset change: "); + lblMaxOffsetSetupUm_ = new JLabel("µm (±)"); cbxAutoUpdateFocusFound_ = new CheckBox("Automatically update offset if focus found", 12, false, CheckBox.RIGHT); spnMaxOffsetSetup_ = Spinner.createIntegerSpinner(3, 0, 10, 1); setSetupOptionsState(false); // movement correction options - final Label lblTimePoints2 = new Label("time points"); // TODO: share this value? - final Label lblCorrectEveryX = new Label("Correct every"); - final Label lblChannel = new Label("Channel:"); - final Label lblMaxDistance = new Label("Max distance:"); - final Label lblMinMovement = new Label("Min movement:"); + final JLabel lblTimePoints2 = new JLabel("time points"); // TODO: share this value? + final JLabel lblCorrectEveryX = new JLabel("Correct every"); + final JLabel lblChannel = new JLabel("Channel:"); + final JLabel lblMaxDistance = new JLabel("Max distance:"); + final JLabel lblMinMovement = new JLabel("Min movement:"); final Spinner spnCorrectEveryX = Spinner.createIntegerSpinner(100, 0, 1000, 1); final Spinner spnMaxDistance = Spinner.createIntegerSpinner(96, 0, 100, 1); final Spinner spnMinMovement = Spinner.createDoubleSpinner(1.0, 0.0, 10.0, 0.5); @@ -156,7 +157,7 @@ public void createUserInterface() { pnlAcqActiveOptions.add(cmbAutofocusChannel_, "wrap"); pnlAcqActiveOptions.add(lblMaxOffsetActive, ""); pnlAcqActiveOptions.add(spnMaxOffset_, ""); - pnlAcqActiveOptions.add(new Label("µm (±)"), ""); + pnlAcqActiveOptions.add(new JLabel("µm (±)"), ""); // autofocus options during setup pnlAcqSetupOptions.add(cbxAutoUpdateFocusFound_, "span 3, wrap"); @@ -172,10 +173,10 @@ public void createUserInterface() { pnlMoveCorrection.add(cmbChannel, "wrap"); pnlMoveCorrection.add(lblMaxDistance, ""); pnlMoveCorrection.add(spnMaxDistance, ""); - pnlMoveCorrection.add(new Label("µm (±)"), "wrap"); + pnlMoveCorrection.add(new JLabel("µm (±)"), "wrap"); pnlMoveCorrection.add(lblMinMovement, ""); pnlMoveCorrection.add(spnMinMovement, ""); - pnlMoveCorrection.add(new Label("µm (±)"), ""); + pnlMoveCorrection.add(new JLabel("µm (±)"), ""); // add panels to tab add(pnlGeneralOptions, ""); 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 771c44d4..d32c8e5b 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/CameraTab.java @@ -1,13 +1,13 @@ package org.micromanager.lightsheetmanager.gui.tabs; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.gui.components.Button; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.ListeningPanel; import org.micromanager.lightsheetmanager.gui.components.Panel; -import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.gui.components.Spinner; import org.micromanager.lightsheetmanager.model.devices.cameras.CameraBase; +import javax.swing.JLabel; import java.awt.Font; import java.awt.Rectangle; import java.util.Objects; @@ -36,14 +36,15 @@ public class CameraTab extends Panel implements ListeningPanel { } private void createUserInterface() { - final Label lblTitle = new Label("Camera Settings", Font.BOLD, 18); + final JLabel lblTitle = new JLabel("Camera Settings"); + lblTitle.setFont(new Font(Font.SANS_SERIF, Font.BOLD, 18)); final Panel pnlROI = new Panel("Imaging ROI"); - final Label lblOffsetX = new Label("Offset X:"); - final Label lblOffsetY = new Label("Offset Y:"); - final Label lblWidth = new Label("Width:"); - final Label lblHeight = new Label("Height:"); + final JLabel lblOffsetX = new JLabel("Offset X:"); + final JLabel lblOffsetY = new JLabel("Offset Y:"); + final JLabel lblWidth = new JLabel("Width:"); + final JLabel lblHeight = new JLabel("Height:"); btnUnchangedROI_ = new Button("Unchanged", 140, 30); btnFullROI_ = new Button("Full", 70, 30); diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java index 6dfe1838..d023ffea 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java @@ -1,12 +1,12 @@ package org.micromanager.lightsheetmanager.gui.tabs; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.data.CameraMode; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.ListeningPanel; import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.gui.tabs.setup.SetupPanel; -import org.micromanager.lightsheetmanager.LightSheetManager; +import javax.swing.JLabel; import java.awt.Font; import java.util.Objects; @@ -26,7 +26,8 @@ public SetupPathTab(final LightSheetManager model, final int pathNum) { private void createUserInterface() { final String title = (model_.devices().adapter().numImagingPaths() > 1) ? ("Setup Path " + pathNum_) : "Setup Path"; - final Label lblTitle = new Label(title, Font.BOLD, 16); + final JLabel lblTitle = new JLabel(title); + lblTitle.setFont(new Font(Font.SANS_SERIF, Font.BOLD, 16)); setupPanel_ = new SetupPanel(model_, pathNum_); diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java index 1803a6fe..bc2c7f6b 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/AdvancedTimingPanel.java @@ -1,28 +1,28 @@ package org.micromanager.lightsheetmanager.gui.tabs.acquisition; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.AcquisitionSettings; import org.micromanager.lightsheetmanager.api.TimingSettings; import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings; import org.micromanager.lightsheetmanager.gui.components.CheckBox; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.gui.components.SettingsListener; import org.micromanager.lightsheetmanager.gui.components.Spinner; -import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.model.utils.NumberUtils; +import javax.swing.JLabel; import java.util.Objects; public class AdvancedTimingPanel extends Panel implements SettingsListener { - private Label lblDelayBeforeScan_; - private Label lblScansPerSlice_; - private Label lblScanDuration_; - private Label lblDelayBeforeLaser_; - private Label lblDelayBeforeCamera_; - private Label lblLaserTriggerDuration_; - private Label lblCameraTriggerDuration_; - private Label lblCameraExposure_; + private JLabel lblDelayBeforeScan_; + private JLabel lblScansPerSlice_; + private JLabel lblScanDuration_; + private JLabel lblDelayBeforeLaser_; + private JLabel lblDelayBeforeCamera_; + private JLabel lblLaserTriggerDuration_; + private JLabel lblCameraTriggerDuration_; + private JLabel lblCameraExposure_; private Spinner spnDelayBeforeScan_; private Spinner spnDelayBeforeLaser_; @@ -52,14 +52,14 @@ private void createUserInterface() { "[]5[]" ); - lblDelayBeforeScan_ = new Label("Delay Before Scan [ms]: "); - lblScansPerSlice_ = new Label("Scans Per Slice: "); - lblScanDuration_ = new Label("Scan Duration [ms]: "); - lblDelayBeforeLaser_ = new Label("Delay Before Laser [ms]: "); - lblDelayBeforeCamera_ = new Label("Delay Before Camera [ms]: "); - lblLaserTriggerDuration_ = new Label("Laser Trigger Duration [ms]: "); - lblCameraTriggerDuration_ = new Label("Camera Trigger Duration [ms]: "); - lblCameraExposure_ = new Label("Camera Exposure [ms]: "); + lblDelayBeforeScan_ = new JLabel("Delay Before Scan [ms]: "); + lblScansPerSlice_ = new JLabel("Scans Per Slice: "); + lblScanDuration_ = new JLabel("Scan Duration [ms]: "); + lblDelayBeforeLaser_ = new JLabel("Delay Before Laser [ms]: "); + lblDelayBeforeCamera_ = new JLabel("Delay Before Camera [ms]: "); + lblLaserTriggerDuration_ = new JLabel("Laser Trigger Duration [ms]: "); + lblCameraTriggerDuration_ = new JLabel("Camera Trigger Duration [ms]: "); + lblCameraExposure_ = new JLabel("Camera Exposure [ms]: "); final TimingSettings timingSettings = model_.acquisitions().settings().timing(); diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/DurationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/DurationPanel.java index 33d3b561..aa6442d8 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/DurationPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/DurationPanel.java @@ -1,17 +1,16 @@ package org.micromanager.lightsheetmanager.gui.tabs.acquisition; -import org.micromanager.lightsheetmanager.gui.components.Label; -import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.LightSheetManager; +import org.micromanager.lightsheetmanager.gui.components.Panel; import javax.swing.JLabel; import java.util.Objects; public class DurationPanel extends Panel { - private Label lblSliceTimeValue_; - private Label lblVolumeTimeValue_; - private Label lblTotalTimeValue_; + private JLabel lblSliceTimeValue_; + private JLabel lblVolumeTimeValue_; + private JLabel lblTotalTimeValue_; public DurationPanel(final LightSheetManager model) { super("Durations"); @@ -24,15 +23,15 @@ private void createUserInterface() { // prevent panel from moving when values change setAbsoluteSize(120, 95); - lblSliceTimeValue_ = new Label("0.0 ms"); - lblVolumeTimeValue_ = new Label("0.0 ms"); - lblTotalTimeValue_ = new Label("0.0 s"); + lblSliceTimeValue_ = new JLabel("0.0 ms"); + lblVolumeTimeValue_ = new JLabel("0.0 ms"); + lblTotalTimeValue_ = new JLabel("0.0 s"); - add(new Label("Slice:"), ""); + add(new JLabel("Slice:"), ""); add(lblSliceTimeValue_, "wrap"); - add(new Label("Volume:"), ""); + add(new JLabel("Volume:"), ""); add(lblVolumeTimeValue_, "wrap"); - add(new Label("Total:"), ""); + add(new JLabel("Total:"), ""); add(lblTotalTimeValue_, ""); } 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 afe3e9a3..a18e6974 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 @@ -1,21 +1,21 @@ package org.micromanager.lightsheetmanager.gui.tabs.acquisition; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.AcquisitionSettings; import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings; import org.micromanager.lightsheetmanager.gui.components.Button; import org.micromanager.lightsheetmanager.gui.components.CheckBox; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.gui.components.SettingsListener; import org.micromanager.lightsheetmanager.gui.components.Spinner; import org.micromanager.lightsheetmanager.gui.frames.XYZGridFrame; -import org.micromanager.lightsheetmanager.LightSheetManager; +import javax.swing.JLabel; import java.util.Objects; public class PositionPanel extends Panel implements SettingsListener { - private Label lblPostMoveDelay_; + private JLabel lblPostMoveDelay_; private Spinner spnPostMoveDelay_; private Button btnOpenXYZGrid_; private Button btnEditPositionList_; @@ -35,7 +35,7 @@ public PositionPanel(final LightSheetManager model, final CheckBox checkBox) { private void createUserInterface() { // post move delay - lblPostMoveDelay_ = new Label("Post-move delay [ms]:"); + lblPostMoveDelay_ = new JLabel("Post-move delay [ms]:"); Spinner.setDefaultSize(8); spnPostMoveDelay_ = Spinner.createIntegerSpinner( model_.acquisitions().settings().postMoveDelay(), diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SlicePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SlicePanel.java index 94e02f33..0813559e 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SlicePanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SlicePanel.java @@ -1,16 +1,16 @@ package org.micromanager.lightsheetmanager.gui.tabs.acquisition; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.AcquisitionSettings; import org.micromanager.lightsheetmanager.api.SliceSettings; import org.micromanager.lightsheetmanager.api.data.CameraMode; import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings; import org.micromanager.lightsheetmanager.gui.components.CheckBox; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.gui.components.SettingsListener; import org.micromanager.lightsheetmanager.gui.components.Spinner; -import org.micromanager.lightsheetmanager.LightSheetManager; +import javax.swing.JLabel; import java.util.Objects; // TODO: make a separate panel for diSPIM? @@ -18,16 +18,16 @@ public class SlicePanel extends Panel implements SettingsListener { // regular panel private CheckBox cbxMinimizePeriod_; - private Label lblSlicePeriod_; - private Label lblSampleExposure_; + private JLabel lblSlicePeriod_; + private JLabel lblSampleExposure_; private Spinner spnSlicePeriod_; private Spinner spnSampleExposure_; // virtual slit panel - private Label lblScanResetTime_; - private Label lblScanSettleTime_; - private Label lblShutterWidth_; - private Label lblShutterSpeed_; + private JLabel lblScanResetTime_; + private JLabel lblScanSettleTime_; + private JLabel lblShutterWidth_; + private JLabel lblShutterSpeed_; private Spinner spnScanResetTime_; private Spinner spnScanSettleTime_; private Spinner spnShutterWidth_; @@ -54,8 +54,8 @@ private void createUserInterface() { final boolean periodMinimized = sliceSettings.periodMinimized(); // regular panel - lblSlicePeriod_ = new Label("Slice period [ms]:"); - lblSampleExposure_ = new Label("Sample exposure [ms]:"); + lblSlicePeriod_ = new JLabel("Slice period [ms]:"); + lblSampleExposure_ = new JLabel("Sample exposure [ms]:"); cbxMinimizePeriod_ = new CheckBox( "Minimize slice period", 12, periodMinimized, CheckBox.RIGHT); spnSlicePeriod_ = Spinner.createDoubleSpinner( @@ -70,10 +70,10 @@ private void createUserInterface() { // final DefaultSliceSettingsLS sliceSettingsLS = model_.acquisitions().settings().sliceLS(); // // // virtual slit panel -// lblScanResetTime_ = new Label("Scan Reset Time [ms]:"); -// lblScanSettleTime_ = new Label("Scan Settle Time [ms]:"); -// lblShutterWidth_ = new Label("Shutter Width [µs]:"); -// lblShutterSpeed_ = new Label("1 / (shutter speed):"); +// lblScanResetTime_ = new JLabel("Scan Reset Time [ms]:"); +// lblScanSettleTime_ = new JLabel("Scan Settle Time [ms]:"); +// lblShutterWidth_ = new JLabel("Shutter Width [µs]:"); +// lblShutterSpeed_ = new JLabel("1 / (shutter speed):"); // spnScanResetTime_ = Spinner.createDoubleSpinner( // sliceSettingsLS.scanResetTime(), 1.0, 100.0, 0.25); // spnScanSettleTime_ = Spinner.createDoubleSpinner( diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java index 00120623..7a37fdde 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/TimePointsPanel.java @@ -1,20 +1,20 @@ package org.micromanager.lightsheetmanager.gui.tabs.acquisition; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.AcquisitionSettings; import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings; import org.micromanager.lightsheetmanager.gui.components.CheckBox; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.gui.components.SettingsListener; import org.micromanager.lightsheetmanager.gui.components.Spinner; -import org.micromanager.lightsheetmanager.LightSheetManager; +import javax.swing.JLabel; import java.util.Objects; public class TimePointsPanel extends Panel implements SettingsListener { - private Label lblNumTimePoints_; - private Label lblTimePointInterval_; + private JLabel lblNumTimePoints_; + private JLabel lblTimePointInterval_; private Spinner spnNumTimePoints_; private Spinner spnTimePointInterval_; @@ -39,8 +39,8 @@ private void createUserInterface() { ); Spinner.setDefaultSize(6); - lblNumTimePoints_ = new Label("Number:"); - lblTimePointInterval_ = new Label("Interval [s]:"); + lblNumTimePoints_ = new JLabel("Number:"); + lblTimePointInterval_ = new JLabel("Interval [s]:"); spnNumTimePoints_ = Spinner.createIntegerSpinner( acqSettings.numTimePoints(), 1, Integer.MAX_VALUE,1); spnTimePointInterval_ = Spinner.createDoubleSpinner( diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumePanel.java index d31953ed..7ca456cd 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumePanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/VolumePanel.java @@ -1,17 +1,17 @@ package org.micromanager.lightsheetmanager.gui.tabs.acquisition; +import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.AcquisitionSettings; import org.micromanager.lightsheetmanager.api.VolumeSettings; import org.micromanager.lightsheetmanager.api.data.GeometryType; -import org.micromanager.lightsheetmanager.LightSheetManager; import org.micromanager.lightsheetmanager.api.internal.DispimAcquisitionSettings; import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings; import org.micromanager.lightsheetmanager.gui.components.ComboBox; -import org.micromanager.lightsheetmanager.gui.components.Label; import org.micromanager.lightsheetmanager.gui.components.Panel; import org.micromanager.lightsheetmanager.gui.components.SettingsListener; import org.micromanager.lightsheetmanager.gui.components.Spinner; +import javax.swing.JLabel; import java.util.Objects; public class VolumePanel extends Panel implements SettingsListener { @@ -53,11 +53,11 @@ private void createUserInterface() { viewOptions[i] = i + 1; } - final Label lblNumViews = new Label("Number of views:"); - final Label lblFirstView = new Label("First view:"); - final Label lblViewDelay = new Label("Delay before view [ms]:"); - final Label lblSlicesPerView = new Label("Slices per view:"); - final Label lblSliceStepSize = new Label("Slice step size [µm]:"); + final JLabel lblNumViews = new JLabel("Number of views:"); + final JLabel lblFirstView = new JLabel("First view:"); + final JLabel lblViewDelay = new JLabel("Delay before view [ms]:"); + final JLabel lblSlicesPerView = new JLabel("Slices per view:"); + final JLabel lblSliceStepSize = new JLabel("Slice step size [µm]:"); // if the number of sides has changed and the firstView or numViews is larger // than the number of sides, default to 1. @@ -100,7 +100,7 @@ private void createUserInterface() { case SCAPE: add(lblViewDelay, ""); add(spnViewDelay_, "wrap"); - add(new Label("Number of slices:"), ""); + add(new JLabel("Number of slices:"), ""); add(spnNumSlices_, "wrap"); add(lblSliceStepSize, ""); add(spnSliceStepSize_, "");