From e6f02d332d9b75eebbde24ee53bb4914729044f4 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 28 Sep 2023 14:27:43 -0700 Subject: [PATCH] disable af button for now --- .../gui/tabs/setup/PiezoCalibrationPanel.java | 2 ++ .../model/acquisitions/AcquisitionEngine.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java index 93bd8e8..3cb88e7 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java +++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java @@ -84,6 +84,8 @@ private void createUserInterface() { btnStepUp_ = new Button(Icons.ARROW_UP); btnStepDown_ = new Button(Icons.ARROW_DOWN); + btnRunAutofocus_.setEnabled(false); + switch (geometryType) { case DISPIM: add(lblSlope, ""); 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 06ba07f..9864638 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java @@ -186,6 +186,7 @@ public boolean isRunning() { } private void runAcquisitionSCAPE() { +// System.out.println("nTimePoints: " + acqSettings_.numTimePoints()); // System.out.println(asb_); // System.out.println(asb_.build()); final boolean isPolling = frame_.getNavigationPanel().isPolling(); @@ -777,7 +778,7 @@ private boolean doHardwareCalculationsSCAPE(PLogicDISPIM plc) { // make sure slice timings are up-to-date final double sliceDuration1 = getSliceDuration(asb_.timingSettingsBuilder()); asb_.timingSettingsBuilder().sliceDuration(sliceDuration1); - + recalculateSliceTiming(asb_); System.out.println("after recalculateSliceTiming: " + asb_.timingSettingsBuilder());