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

clarify camera notifications
nicost · Apr 10, 2024 · c4cfc89 · c4cfc89
2 parents 669aa40 + fca507f
commit c4cfc89
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.acqengj</groupId>
     <artifactId>AcqEngJ</artifactId>
-    <version>0.35.1</version>
+    <version>0.36.0</version>
     <packaging>jar</packaging>
      <name>AcqEngJ</name>
     <description>Java-based Acquisition engine for Micro-Manager</description>

diff --git a/src/main/java/org/micromanager/acqj/internal/Engine.java b/src/main/java/org/micromanager/acqj/internal/Engine.java
@@ -407,7 +407,7 @@ private void acquireImages(final AcquisitionEvent event,
             }
             event.acquisition_.postNotification(
                   new AcqNotification(AcqNotification.Camera.class,
-                        event.getAxesAsJSONString(), AcqNotification.Camera.POST_EXPOSURE));
+                        event.getAxesAsJSONString(), AcqNotification.Camera.POST_SNAP));
             for (AcquisitionHook h : event.acquisition_.getAfterExposureHooks()) {
                h.run(event);
             }
@@ -540,9 +540,7 @@ private void acquireImages(final AcquisitionEvent event,
                      throw new RuntimeException(e);
                   }
                }
-               event.acquisition_.postNotification(
-                     new AcqNotification(AcqNotification.Camera.class,
-                           axesAsJSONString, AcqNotification.Camera.POST_EXPOSURE));
+
                for (AcquisitionHook h : event.acquisition_.getAfterExposureHooks()) {
                   h.run(event);
                }
@@ -600,6 +598,10 @@ private void acquireImages(final AcquisitionEvent event,
       // this is not the most pleasant place to put this call, but I can not find anything better.
       stopHardwareSequences(hardwareSequencesInProgress);
 
+      event.acquisition_.postNotification(
+              new AcqNotification(AcqNotification.Camera.class,
+                      axesAsJSONString, AcqNotification.Camera.POST_SEQUENCE_STOPPED));
+
       if (timeout) {
          throw new TimeoutException("Timeout waiting for images to arrive in circular buffer");
       }

diff --git a/src/main/java/org/micromanager/acqj/main/AcqNotification.java b/src/main/java/org/micromanager/acqj/main/AcqNotification.java
@@ -19,8 +19,9 @@ public class Hardware {
 
    public class Camera {
       public static final String PRE_SEQUENCE_STARTED = "pre_sequence_started";
+      public static final String POST_SEQUENCE_STOPPED = "post_sequence_stopped";
       public static final String PRE_SNAP = "pre_snap";
-      public static final String POST_EXPOSURE = "post_exposure";
+      public static final String POST_SNAP = "post_snap";
 
    }