From 4345e8cc73ca1df6a5aea50c18398a12344ec22a Mon Sep 17 00:00:00 2001 From: Brandon Date: Fri, 10 May 2024 16:54:50 -0700 Subject: [PATCH] minor updates --- .../gui/tabs/acquisition/AdvancedTimingPanel.java | 13 ++----------- .../gui/tabs/acquisition/SliceSettingsPanel.java | 11 ++++++----- .../gui/tabs/channels/ChannelTable.java | 12 +++--------- .../gui/tabs/channels/ChannelTablePanel.java | 2 +- 4 files changed, 12 insertions(+), 26 deletions(-) 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 4cfda80..50287a7 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 @@ -22,7 +22,7 @@ public class AdvancedTimingPanel extends Panel { private CheckBox cbxAlternateScanDirection_; - private LightSheetManagerModel model_; + private final LightSheetManagerModel model_; public AdvancedTimingPanel(final LightSheetManagerModel model) { super("Advanced Timing Settings"); @@ -68,7 +68,7 @@ private void createUserInterface() { timingSettings.cameraExposure(), 0.0, 1000.0, 0.25); cbxAlternateScanDirection_ = new CheckBox( - "Alternate Scan Direction", false, CheckBox.LEFT); + "Alternate scan direction", false, CheckBox.LEFT); add(lblDelayBeforeScan, ""); add(spnDelayBeforeScan_, "wrap"); @@ -94,55 +94,46 @@ private void createEventHandlers() { spnDelayBeforeScan_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().delayBeforeScan(spnDelayBeforeScan_.getDouble()); - //System.out.println("delayBeforeScan: " + acqSettings.getTimingSettings().delayBeforeScan()); }); spnScansPerSlice_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().scansPerSlice(spnScansPerSlice_.getInt()); - //System.out.println("scansPerSlice: " + acqSettings.getTimingSettings().scansPerSlice()); }); spnScanDuration_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().scanDuration(spnScanDuration_.getDouble()); - //System.out.println("scanDuration: " + acqSettings.getTimingSettings().scanDuration()); }); spnDelayBeforeLaser_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().delayBeforeLaser(spnDelayBeforeLaser_.getDouble()); - //System.out.println("delayBeforeLaser: " + acqSettings.getTimingSettings().delayBeforeLaser()); }); spnLaserTriggerDuration_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().laserTriggerDuration(spnLaserTriggerDuration_.getDouble()); - //System.out.println("laserTriggerDuration: " + acqSettings.getTimingSettings().laserTriggerDuration()); }); spnDelayBeforeCamera_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().delayBeforeCamera(spnDelayBeforeCamera_.getDouble()); - //System.out.println("delayBeforeCamera: " + acqSettings.getTimingSettings().delayBeforeCamera()); }); spnCameraTriggerDuration_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().cameraTriggerDuration(spnCameraTriggerDuration_.getDouble()); - //System.out.println("cameraTriggerDuration: " + acqSettings.getTimingSettings().cameraTriggerDuration()); }); spnCameraExposure_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().cameraExposure(spnCameraExposure_.getDouble()); - //System.out.println("cameraExposure: " + acqSettings.getTimingSettings().cameraExposure()); }); cbxAlternateScanDirection_.registerListener(e -> { model_.acquisitions().settingsBuilder() .timingSettingsBuilder().useAlternateScanDirection(cbxAlternateScanDirection_.isSelected()); - //System.out.println("useAlternateScanDirection: " + acqSettings.getTimingSettings().useAlternateScanDirection()); }); } } diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java index e5407a4..71ce58f 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/acquisition/SliceSettingsPanel.java @@ -11,6 +11,7 @@ import java.util.Objects; +// TODO: virtual slit panel not needed in SCAPE mode public class SliceSettingsPanel extends Panel { // regular panel @@ -66,7 +67,7 @@ private void createUserInterface() { // virtual slit panel lblScanResetTime_ = new Label("Scan Reset Time [ms]:"); lblScanSettleTime_ = new Label("Scan Settle Time [ms]:"); - lblShutterWidth_ = new Label("Shutter Width [\u00B5s]:"); + lblShutterWidth_ = new Label("Shutter Width [µs]:"); lblShutterSpeed_ = new Label("1 / (shutter speed):"); spnScanResetTime_ = Spinner.createDoubleSpinner( sliceSettingsLS.scanResetTime(), 1.0, 100.0, 0.25); @@ -88,11 +89,11 @@ private void createEventHandlers() { // regular panel cbxMinimizeSlicePeriod_.registerListener(e -> { - final boolean selected = !cbxMinimizeSlicePeriod_.isSelected(); - lblSlicePeriod_.setEnabled(selected); - spnSlicePeriod_.setEnabled(selected); + final boolean selected = cbxMinimizeSlicePeriod_.isSelected(); + lblSlicePeriod_.setEnabled(!selected); + spnSlicePeriod_.setEnabled(!selected); model_.acquisitions().settingsBuilder() - .sliceSettingsBuilder().minimizeSlicePeriod(!selected); + .sliceSettingsBuilder().minimizeSlicePeriod(selected); }); spnSlicePeriod_.registerListener(e -> { diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java index 02e9024..630433b 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTable.java @@ -22,7 +22,7 @@ public class ChannelTable extends JScrollPane { private ChannelTableData tableData_; private ChannelTableModel tableModel_; - private LightSheetManagerModel model_; + private final LightSheetManagerModel model_; public ChannelTable(final LightSheetManagerModel model) { model_ = Objects.requireNonNull(model); @@ -83,12 +83,10 @@ public JTable getTable() { } public void updatePresetCombos(final String channelGroup) { - //System.out.println("channelGroup: " + channelGroup); final String[] presets = getAllPresets(channelGroup); cmbPresets_.removeAllItems(); for (String preset : presets) { cmbPresets_.addItem(preset); - //System.out.println("preset " + preset); } cmbPresets_.setSelectedItem(channelGroup); } @@ -98,7 +96,6 @@ private String[] getAllPresets(final String configGroup) { return model_.studio().core().getAvailableConfigs(configGroup).toArray(); } - // TODO: probably should be in the model public String[] getAvailableGroups() { StrVector groups; @@ -123,10 +120,7 @@ public String[] getAvailableGroups() { } public void setHeaderRowColor(final boolean state) { - if (state) { - table_.getTableHeader().setForeground(Color.BLACK); - } else { - table_.getTableHeader().setForeground(Color.GRAY); - } + table_.getTableHeader().setForeground(state ? Color.BLACK : Color.GRAY); } + } 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 87b5d53..dffb3b9 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 @@ -104,7 +104,7 @@ private void createEventHandlers() { final Object currentLabel = cmbChannelGroup_.getSelectedItem(); final String[] groupLabels = table_.getAvailableGroups(); cmbChannelGroup_.removeAllItems(); - for (String label : groupLabels){ + for (String label : groupLabels) { cmbChannelGroup_.addItem(label); //System.out.println(label); if (label.equals(currentLabel)) {