Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ private void computeCameraOrder() {
// but needs additional work to support 4. Use a reorderable JTable?
for (int i = 0; i < cameraNames.length; i++) {
if (!selected.equals(cameraNames[i])) {
System.out.println("cameraNames[i] " + cameraNames[i] + "active[i] " + active[i]);
cameraData.add(new CameraData(cameraNames[i], active[i]));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.micromanager.data.internal.DefaultSummaryMetadata;
import org.micromanager.internal.MMStudio;
import org.micromanager.lightsheetmanager.api.data.AcquisitionMode;
import org.micromanager.lightsheetmanager.api.data.CameraData;
import org.micromanager.lightsheetmanager.api.data.CameraLibrary;
import org.micromanager.lightsheetmanager.api.data.CameraMode;
import org.micromanager.lightsheetmanager.api.data.MultiChannelMode;
Expand All @@ -43,7 +44,6 @@
import java.awt.geom.Point2D;
import java.io.IOException;
import java.util.ArrayList;
import java.util.stream.IntStream;


public class AcquisitionEngineSCAPE extends AcquisitionEngine {
Expand Down Expand Up @@ -86,14 +86,22 @@ boolean setup() {
// }

// we must have an active camera if we are using simultaneous cameras
// if (model_.acquisitions().settings().isUsingSimultaneousCameras()) {
// final boolean[] active = model_.acquisitions().settings().imagingCamerasActive();
// if (IntStream.range(0, active.length).noneMatch(i -> active[i])) {
// studio_.logs().showError("Using simultaneous cameras and no cameras are active!");
// return false;
// }
// // TODO: primary camera must be active
// }
if (model_.acquisitions().settings().isUsingSimultaneousCameras()) {
final CameraData[] cameras = model_.acquisitions().settings().imagingCameraOrder();
if (cameras.length > 0 && !cameras[0].isActive()) {
studio_.logs().showError("The primary camera MUST be active in simultaneous cameras mode!");
return false;
}
// set the core camera device to the primary camera
if (cameras.length > 1) {
try {
core_.setCameraDevice(cameras[0].name());
} catch (Exception e) {
studio_.logs().showError("Could not set \"Core-Camera\" for simultaneous cameras.");
return false;
}
}
}

// this is needed for LSMAcquisitionEvents to work with multiple positions
if (core_.getFocusDevice().isEmpty()
Expand Down
Loading