Merge pull request #299 from bls337/main

small fix for last commit; reenable edit position list btn
micro-manager · Sep 4, 2024 · 4fcc429 · 4fcc429
2 parents b884329 + a5aa354
commit 4fcc429
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java
@@ -119,7 +119,7 @@ private void createUserInterface() {
                 "Time Points", acqSettings.isUsingTimePoints());
         pnlTimePoints_ = new TimePointsPanel(model_, cbxUseTimePoints_);
         // disable elements based on acqSettings
-        pnlTimePoints_.setEnabled(acqSettings.isUsingTimePoints());
+        pnlTimePoints_.setPanelEnabled(acqSettings.isUsingTimePoints());
 
         // acquisition buttons
         pnlButtons_ = new Panel();
@@ -244,14 +244,14 @@ private void createEventHandlers() {
         cbxUseMultiplePositions_.registerListener(e -> {
             final boolean isSelected = cbxUseMultiplePositions_.isSelected();
             model_.acquisitions().settingsBuilder().useMultiplePositions(isSelected);
-            pnlMultiPositions_.setEnabled(isSelected);
+            pnlMultiPositions_.setPanelEnabled(isSelected);
         });
 
         // time points
         cbxUseTimePoints_.registerListener(e -> {
             final boolean selected = cbxUseTimePoints_.isSelected();
             model_.acquisitions().settingsBuilder().useTimePoints(selected);
-            pnlTimePoints_.setEnabled(selected);
+            pnlTimePoints_.setPanelEnabled(selected);
             //updateDurationLabels();
         });
 

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
@@ -65,8 +65,7 @@ private void createEventHandlers() {
         });
     }
 
-    @Override
-    public void setEnabled(final boolean state) {
+    public void setPanelEnabled(final boolean state) {
         lblNumTimePoints_.setEnabled(state);
         lblTimePointInterval_.setEnabled(state);
         spnNumTimePoints_.setEnabled(state);