Merge pull request #160 from bls337/main

hardware triggering for scape, set camera mode
micro-manager · Oct 2, 2023 · f92001f · f92001f
2 parents 4b960f7 + cc3abac
commit f92001f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java
@@ -97,7 +97,7 @@ private void createEventHandlers() {
             cmbChannelGroup_.removeAllItems();
             for (String label : groupLabels){
                 cmbChannelGroup_.addItem(label);
-                System.out.println(label);
+                //System.out.println(label);
                 if (label.equals(currentLabel)) {
                     cmbChannelGroup_.setSelectedItem(currentLabel);
                 }

diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SingleAxisPanel.java
@@ -25,7 +25,7 @@ public class SingleAxisPanel extends Panel {
     private final LightSheetManagerModel model_;
 
     public SingleAxisPanel(final LightSheetManagerModel model) {
-        super("Single Axis Y");
+        super("Scanner - Single Axis Y");
         model_ = Objects.requireNonNull(model);
         createUserInterface();
         createEventHandlers();

diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java b/src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngine.java
@@ -1448,6 +1448,15 @@ private void stopSPIMStateMachines(DefaultAcquisitionSettingsDISPIM acqSettings)
     public void recalculateSliceTiming(DefaultAcquisitionSettingsDISPIM.Builder asb) {
         // don't change timing settings if user is using advanced timing
         if (asb.isUsingAdvancedTiming()) {
+            // TODO: find a better place to set the camera trigger mode for SCAPE
+            if (model_.devices().getDeviceAdapter().getMicroscopeGeometry() == GeometryType.SCAPE) {
+                CameraBase camera = model_.devices().getDevice("ImagingCamera");
+                camera.setTriggerMode(asb.cameraMode());
+                studio_.logs().logDebugMessage(
+                        "camera \"" + camera.getDeviceName() + "\" set to mode: " + camera.getTriggerMode());
+                //System.out.println(camera.getDeviceName());
+                //System.out.println(camMode);
+            }
             return;
         }
         // TODO: update builder here