Merge pull request #321 from bls337/main

Fix getImagingCameras() method

Author: bls337

src/main/java/org/micromanager/lightsheetmanager/model/DeviceManager.java

@@ -275,11 +275,11 @@ public CameraBase[] getImagingCameras() {
             for (int j = 0; j < numCameras; j++) {
                 String cameraName = "Imaging";
                 if (numImagingPaths > 1) {
-                    cameraName += String.valueOf(i);
+                    cameraName += String.valueOf(i + 1);
                 }
                 cameraName += "Camera";
                 if (numCameras > 1) {
-                    cameraName += String.valueOf(j);
+                    cameraName += String.valueOf(j + 1);
                 }
                 cameraNames.add((CameraBase)deviceMap_.get(cameraName));
             }

src/main/java/org/micromanager/lightsheetmanager/model/acquisitions/AcquisitionEngineSCAPE.java

@@ -1101,8 +1101,12 @@ public DefaultTimingSettings.Builder getTimingFromPeriodAndLightExposure() {
             // just a dummy to test demo mode
             return new DefaultTimingSettings.Builder();
         }
-        // TODO: do this in ui?
-        camera.setTriggerMode(acqSettings_.cameraMode());
+
+        // TODO: is this necessary? setTriggerMode is called in doHardwareCalculations too
+        CameraBase[] cameras = model_.devices().getImagingCameras();
+        for (CameraBase cam : cameras) {
+            cam.setTriggerMode(acqSettings_.cameraMode());
+        }
 
         // TODO: camera.getTriggerMode(); does not match up with actual selected trigger mode for PVCAM (pseudo overlap reads as edge trigger)
         //System.out.println(camera.getDeviceName());