Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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.7.8";
public static final String version = "0.8.0";

private Studio studio_;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -534,10 +534,20 @@ public void setPause(boolean b) {

@Override
public boolean abortRequest() {
if (currentAcquisition_ != null) {
currentAcquisition_.abort();
// read once: the acquisition thread clears this field as soon as finish() returns
final Acquisition acq = currentAcquisition_;
if (acq == null) {
return true; // nothing is running, so there is nothing to protect
}
return true;
// always refuse while a run is live: Micro-Manager vetoes the close, and that veto is what
// keeps it from racing the abort into finish(), whose save closes the same datastore from
// the acquisition thread. answering yes only aborts, so the close succeeds on the next
// attempt. the display's abort button also lands here and ignores the result.
if (model_.logging().confirmOrDefault("Abort Acquisition",
"Abort the current acquisition task?", false)) {
acq.abort();
}
return false;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
public class ASIPLogic extends ASITigerBase {

public static final int addrZero = 0;
public static final int addrEdge = 0;
public static final int addrEdge = 128;
public static final int addrInvert = 64;

// front panel BNC 1-8
Expand Down
Loading