Merge pull request micro-manager#1967 from henrypinkard/main

Include non MDA acquisitions in checks for active Acqs
nicost · Jun 15, 2024 · 913b4e7 · 913b4e7
2 parents 14308c0 + 57487c2
commit 913b4e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/buildscripts/ivy.xml b/buildscripts/ivy.xml
@@ -49,16 +49,15 @@
       <dependency org="org.micro-manager.acqengj" name="AcqEngJ" rev="0.38.0">
          <exclude org="org.micro-manager.mmcorej" name="MMCoreJ"/>
       </dependency>
-		<dependency org="org.micro-manager.ndviewer" name="NDViewer" rev="0.10.2">
+      <dependency org="org.micro-manager.ndviewer" name="NDViewer" rev="0.10.2">
          <exclude org="org.micro-manager.mmcorej" name="MMCoreJ"/>
       </dependency>
-		<dependency org="org.micro-manager.ndtiffstorage" name="NDTiffStorage" rev="2.17.0">
+      <dependency org="org.micro-manager.ndtiffstorage" name="NDTiffStorage" rev="2.18.2">
          <exclude org="org.micro-manager.mmcorej" name="MMCoreJ"/>
       </dependency>
-		<dependency org="org.micro-manager.pycro-manager" name="PycroManagerJava" rev="0.46.8">
+      <dependency org="org.micro-manager.pycro-manager" name="PycroManagerJava" rev="0.46.12">
          <exclude org="org.micro-manager.mmcorej" name="MMCoreJ"/>
       </dependency>
-
       <dependency org="io.scif" name="scifio" rev="0.41.0"/>
 
       <!-- Delete once "parent" package upgrade to a log4j free version -->

diff --git a/...dio/src/main/java/org/micromanager/acquisition/internal/acqengjcompat/AcqEngJAdapter.java b/...dio/src/main/java/org/micromanager/acquisition/internal/acqengjcompat/AcqEngJAdapter.java
@@ -1387,7 +1387,8 @@ public boolean isAcquisitionRunning() {
          return (!currentAcquisition_.areEventsFinished()
                || (curPipeline_ != null && !curPipeline_.isHalted()));
       } else {
-         return false;
+         // check if AcqEngJ is running acquisition aside from MM MDA (e.g. pycro-manager, plugin)
+         return AcquisitionAPI.anyAcquisitionsRunning();
       }
    }