From f1f97fc8d956981d2faea9e88ae8df3d7b0a885c Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 22 Jun 2026 16:24:00 -0700 Subject: [PATCH 1/2] add requestRun() without params --- .../model/acquisitions/AcquisitionEngine.java | 4 ++++ 1 file changed, 4 insertions(+) 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 340d66a..e514027 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java @@ -105,6 +105,10 @@ public void updateSettings() { acqSettings_ = asb_.build(); } + public Future requestRun() { + return requestRun(false); + } + @Override public Future requestRun(boolean speedTest) { // Run on a new thread, so it doesn't block the EDT From 992fd18d89fb30e3480a3c1a56bf240e6dd1d994 Mon Sep 17 00:00:00 2001 From: Brandon Date: Mon, 22 Jun 2026 17:18:00 -0700 Subject: [PATCH 2/2] add updateSettings method --- .../micromanager/lightsheetmanager/LightSheetManagerPlugin.java | 2 +- .../org/micromanager/lightsheetmanager/model/UserSettings.java | 2 +- .../lightsheetmanager/model/acquisitions/AcquisitionEngine.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java b/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java index 108c7cb..2c4aa77 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java +++ b/src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java @@ -14,7 +14,7 @@ public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin { public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2026"; public static final String description = "A plugin to control various types of light sheet microscopes."; public static final String menuName = "Light Sheet Manager"; - public static final String version = "0.6.7"; + public static final String version = "0.6.8"; private Studio studio_; private LightSheetManager model_; diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java b/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java index d7e3cd9..37ab9f1 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java @@ -118,7 +118,7 @@ public void load() { public void loadFromJson(final String json, final boolean notify) { // TODO: switch this based on microscope geometry type var settings = ScapeAcquisitionSettings.fromJson(json, ScapeAcquisitionSettings.class); - model_.acquisitions().setAcquisitionSettingsAndBuilder(settings); + model_.acquisitions().updateSettings(settings); if (notify) { notifyListeners(settings); // update the ui } 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 e514027..3d4adc4 100644 --- a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java +++ b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java @@ -93,7 +93,7 @@ public void setDurationPanel(final DurationPanel panel) { * * @param acqSettings the {@code DefaultAcquisitionSettingsSCAPE} to use */ - public void setAcquisitionSettingsAndBuilder(final ScapeAcquisitionSettings acqSettings) { + public void updateSettings(final ScapeAcquisitionSettings acqSettings) { asb_ = new ScapeAcquisitionSettings.Builder(acqSettings); acqSettings_ = acqSettings; }