diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java index 83d6390..c34ed8e 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/NavigationTab.java @@ -6,7 +6,7 @@ import java.util.Objects; -public class NavigationTab extends Panel { +public class NavigationTab extends Panel { private final NavigationPanel navigationPanel_; 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 1d49d5f..81a5d92 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 @@ -50,17 +50,17 @@ private void createUserInterface() { // TODO: update duration labels private void createEventHandlers() { - final DefaultAcquisitionSettingsDISPIM.Builder asb_ = + final DefaultAcquisitionSettingsDISPIM.Builder asb = model_.acquisitions().settingsBuilder(); spnNumTimePoints_.registerListener(e -> { - asb_.numTimePoints(spnNumTimePoints_.getInt()); + asb.numTimePoints(spnNumTimePoints_.getInt()); //updateDurationLabels(); //System.out.println("getNumTimePoints: " + model_.acquisitions().getAcquisitionSettings().getNumTimePoints()); }); spnTimePointInterval_.registerListener(e -> { - asb_.timePointInterval(spnTimePointInterval_.getInt()); + asb.timePointInterval(spnTimePointInterval_.getInt()); //updateDurationLabels(); //System.out.println("getTimePointInterval: " + model_.acquisitions().getAcquisitionSettings().getTimePointInterval()); }); diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java index a84fec2..06ba07f 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java @@ -190,7 +190,8 @@ private void runAcquisitionSCAPE() { // System.out.println(asb_.build()); final boolean isPolling = frame_.getNavigationPanel().isPolling(); if (isPolling) { - System.out.println("stopped!"); + studio_.logs().logMessage("stopped position polling"); + //System.out.println("stopped!"); frame_.getNavigationPanel().stopPolling(); } @@ -200,9 +201,6 @@ private void runAcquisitionSCAPE() { asb_.sheetCalibrationBuilder(1).useAutoSheetWidth(true); asb_.sheetCalibrationBuilder(1).autoSheetWidthPerPixel(0.0); - // TODO: put this here for now... (make sure vars are updated) - setAcquisitionSettings(asb_.build()); - final boolean isLiveModeOn = studio_.live().isLiveModeOn(); if (isLiveModeOn) { studio_.live().setLiveModeOn(false); @@ -634,6 +632,7 @@ public void close() { // start polling for navigation panel if (isPolling) { + studio_.logs().logMessage("started position polling after acquisition"); frame_.getNavigationPanel().startPolling(); } }