Skip to content

Commit 9e0e76d

Browse files
author
Brandon
committed
Add generic function to get first camera
1 parent 07520b6 commit 9e0e76d

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

lib/MMJ_.jar

26.6 KB
Binary file not shown.

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,17 @@ public <T extends DeviceBase> T getDevice(final String deviceName) {
240240
return (T) deviceMap_.get(deviceName);
241241
}
242242

243+
public DeviceBase getFirstImagingCamera() {
244+
final LightSheetDeviceManager adapter = model_.devices().getDeviceAdapter();
245+
if (adapter.getNumSimultaneousCameras() > 1) {
246+
return deviceMap_.get("Imaging1Camera1");
247+
} else if (adapter.getNumImagingPaths() > 1) {
248+
return deviceMap_.get("Imaging1Camera");
249+
} else {
250+
return deviceMap_.get("ImagingCamera");
251+
}
252+
}
253+
243254
public DeviceBase getImagingCamera() {
244255
return deviceMap_.get("ImagingCamera");
245256
}

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -532,15 +532,24 @@ public void close() {
532532
}
533533
cameraNames = cameraDeviceNames.toArray(new String[0]);
534534
} else {
535-
if (acqSettings_.volumeSettings().numViews() > 1) {
536-
cameraNames = new String[]{
535+
if (model_.devices().getDeviceAdapter().getNumSimultaneousCameras() > 1) {
536+
// multiple simultaneous cameras
537+
cameraNames = new String[]{
538+
model_.devices().getDevice("Imaging1Camera1").getDeviceName(),
539+
model_.devices().getDevice("Imaging2Camera2").getDeviceName()
540+
};
541+
} else {
542+
// standard camera setup
543+
if (acqSettings_.volumeSettings().numViews() > 1) {
544+
cameraNames = new String[]{
537545
model_.devices().getDevice("Imaging1Camera").getDeviceName(),
538546
model_.devices().getDevice("Imaging2Camera").getDeviceName()
539-
};
540-
} else {
541-
cameraNames = new String[]{
547+
};
548+
} else {
549+
cameraNames = new String[]{
542550
model_.devices().getDevice("ImagingCamera").getDeviceName()
543-
};
551+
};
552+
}
544553
}
545554
}
546555

0 commit comments

Comments
 (0)