Skip to content

add requestRun() without params #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bls337 merged 2 commits into from
Jun 23, 2026
Merged

add requestRun() without params #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1f97fc
add requestRun() without params
Jun 22, 2026
992fd18
add updateSettings method
Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/UserSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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
Expand Down
Loading