Merge pull request micro-manager#1906 from nicost/projector20240306

Projector: Fixes bug not waiting for Galvo when projecting ROIs
nicost · Mar 7, 2024 · 8f8473c · 8f8473c
2 parents 7927cc9 + 384af78
commit 8f8473c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...rojector/src/main/java/org/micromanager/projector/internal/ProjectorControlExecution.java b/...rojector/src/main/java/org/micromanager/projector/internal/ProjectorControlExecution.java
@@ -178,7 +178,9 @@ public void exposeRois(final ProjectionDevice dev, final String targetingChannel
       final String originalConfig = prepareChannel(targetingChannel);
       boolean originalShutterState = prepareShutter(targetingShutter);
       dev.runPolygons();
-      if (!isGalvo) {
+      if (isGalvo) {
+         dev.waitForDevice();
+      } else { // SLM devices do not wait after displaying the image.
          try {
             Thread.sleep(dev.getExposure() / 1000);
          } catch (InterruptedException ex) {

diff --git a/libraries/Projector/src/main/java/org/micromanager/projector/internal/devices/Galvo.java b/libraries/Projector/src/main/java/org/micromanager/projector/internal/devices/Galvo.java
@@ -258,7 +258,6 @@ public void runPolygons() {
             app_.logs().showError(ex);
          }
       });
-
    }
 
    @Override
-Original file line number
+Diff line change
@@ Expand Up / @@ -258,7 +258,6 @@ public void runPolygons() { @@
                 app_.logs().showError(ex);
              }
           });
        }
        @Override
@@ Expand Down @@