better ui for simultaneous cameras

src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerFrame.java

@@ -1,7 +1,6 @@
 package org.micromanager.lightsheetmanager;
 
 import com.google.common.eventbus.Subscribe;
-import mmcorej.CMMCore;
 import net.miginfocom.swing.MigLayout;
 
 import org.micromanager.Studio;
@@ -12,7 +11,6 @@
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.data.Icons;
 import org.micromanager.lightsheetmanager.gui.tabs.TabPanel;
-import org.micromanager.lightsheetmanager.gui.tabs.navigation.NavigationPanel;
 import org.micromanager.lightsheetmanager.gui.utils.WindowUtils;
 import org.micromanager.internal.utils.WindowPositioning;
 
@@ -22,21 +20,17 @@
 
 /**
  * Main GUI frame.
- *
  */
 public class LightSheetManagerFrame extends JFrame {
 
     private final Studio studio_;
-    private final CMMCore core_;
-
     private TabPanel tabPanel_;
 
     private final LightSheetManager model_;
 
     public LightSheetManagerFrame(final LightSheetManager model, final boolean isLoaded) {
         model_ = Objects.requireNonNull(model);
         studio_ = model_.studio();
-        core_ = studio_.core();
 
         // save window position
         WindowPositioning.setUpBoundsMemory(
@@ -140,15 +134,6 @@ private void createUserInterface() {
 
     }
 
-    // TODO: remove when there is a better method to stop polling from acq engine
-    public NavigationPanel getNavigationPanel() {
-        return tabPanel_.getNavigationTab().getNavigationPanel();
-    }
-
-    public Studio getStudio_() {
-        return studio_;
-    }
-
     /**
      * Detect settings after the model is loaded,
      * ask to change settings with dialogs.

src/main/java/org/micromanager/lightsheetmanager/LightSheetManagerPlugin.java

@@ -12,7 +12,7 @@ public class LightSheetManagerPlugin implements MenuPlugin, SciJavaPlugin {
     public static final String copyright = "Applied Scientific Instrumentation (ASI), 2022-2026";
     public static final String description = "A plugin to control various types of light sheet microscopes.";
     public static final String menuName = "Light Sheet Manager";
-    public static final String version = "0.5.6";
+    public static final String version = "0.5.7";
 
     private Studio studio_;
     private LightSheetManager model_;

src/main/java/org/micromanager/lightsheetmanager/api/AcquisitionSettingsSCAPE.java

@@ -33,18 +33,25 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
         T cameraMode(final CameraMode cameraMode);
 
         /**
-         * Sets the first camera used in an acquisition.
+         * Sets the imaging camera order.
          *
-         * @param primaryCamera the primary camera
+         * @param cameraOrder the imaging camera order
          */
-        T primaryCamera(final String primaryCamera);
+        T imagingCameraOrder(final String[] cameraOrder);
+
+        /**
+         * Sets the active imaging cameras.
+         *
+         * @param camerasActive the active imaging cameras
+         */
+        T imagingCamerasActive(final boolean[] camerasActive);
 
         /**
          * Sets the acquisition to acquire from multiple simultaneous cameras.
          *
          * @param state true if acquiring from both sides
          */
-        T isAcqFromBothSides(final boolean state);
+        T useSimultaneousCameras(final boolean state);
 
         /**
          * Sets the acquisition to use channels.
@@ -202,18 +209,25 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
     CameraMode cameraMode();
 
     /**
-     * Returns the name of the primary camera.
+     * Returns the imaging camera order.
+     *
+     * @return the imaging camera order
+     */
+    String[] imagingCameraOrder();
+
+    /**
+     * Returns an array of active imaging cameras.
      *
-     * @return the name of the primary camera
+     * @return an array of active imaging cameras
      */
-    String primaryCamera();
+    boolean[] imagingCamerasActive();
 
     /**
      * Returns true if acquiring from both imaging cameras.
      *
      * @return true if acquiring from both imaging cameras
      */
-    boolean isAcqFromBothSides();
+    boolean isUsingSimultaneousCameras();
 
     /**
      * Returns true if using channels.

src/main/java/org/micromanager/lightsheetmanager/api/internal/DefaultAcquisitionSettingsSCAPE.java

@@ -19,8 +19,9 @@ public static class Builder extends DefaultAcquisitionSettings.Builder<Builder>
         private AcquisitionMode acquisitionMode_ = AcquisitionMode.NO_SCAN;
 
         private CameraMode cameraMode_ = CameraMode.EDGE;
-        private String primaryCamera_ = "";
-        private boolean isAcqFromBothSides_ = false;
+        private String[] imagingCameraOrder_ = {};
+        private boolean[] imagingCamerasActive_ = {};
+        private boolean useSimultaneousCameras_ = true;
 
         private boolean useChannels_ = false;
         private boolean useTimePoints_ = false;
@@ -56,8 +57,9 @@ public Builder(final DefaultAcquisitionSettingsSCAPE acqSettings) {
             }
             acquisitionMode_ = acqSettings.acquisitionMode_;
             cameraMode_ = acqSettings.cameraMode_;
-            primaryCamera_ = acqSettings.primaryCamera_;
-            isAcqFromBothSides_ = acqSettings.isAcqFromBothSides_;
+            imagingCameraOrder_ = acqSettings.imagingCameraOrder_;
+            imagingCamerasActive_ = acqSettings.imagingCamerasActive_;
+            useSimultaneousCameras_ = acqSettings.useSimultaneousCameras_;
             useChannels_ = acqSettings.useChannels_;
             useTimePoints_ = acqSettings.useTimePoints_;
             useAutofocus_ = acqSettings.useAutofocus_;
@@ -100,13 +102,24 @@ public Builder cameraMode(final CameraMode cameraMode) {
         }
 
         /**
-         * Sets the first camera used in an acquisition.
+         * Sets the imaging camera order.
          *
-         * @param primaryCamera the primary camera
+         * @param cameraOrder the imaging camera order
          */
         @Override
-        public Builder primaryCamera(final String primaryCamera) {
-            primaryCamera_ = primaryCamera;
+        public Builder imagingCameraOrder(final String[] cameraOrder) {
+            imagingCameraOrder_ = cameraOrder;
+            return this;
+        }
+
+        /**
+         * Sets the active imaging cameras.
+         *
+         * @param camerasActive the active imaging cameras
+         */
+        @Override
+        public Builder imagingCamerasActive(final boolean[] camerasActive) {
+            imagingCamerasActive_ = camerasActive;
             return this;
         }
 
@@ -116,8 +129,8 @@ public Builder primaryCamera(final String primaryCamera) {
          * @param state true if acquiring from both sides
          */
         @Override
-        public Builder isAcqFromBothSides(final boolean state) {
-            isAcqFromBothSides_ = state;
+        public Builder useSimultaneousCameras(final boolean state) {
+            useSimultaneousCameras_ = state;
             return this;
         }
 
@@ -309,8 +322,9 @@ public String toString() {
     private final AcquisitionMode acquisitionMode_;
 
     private final CameraMode cameraMode_;
-    private final String primaryCamera_;
-    private final boolean isAcqFromBothSides_;
+    private final String[] imagingCameraOrder_;
+    private final boolean[] imagingCamerasActive_;
+    private final boolean useSimultaneousCameras_;
 
     private final boolean useChannels_;
     private final boolean useTimePoints_;
@@ -341,8 +355,9 @@ private DefaultAcquisitionSettingsSCAPE(Builder builder) {
         }
         acquisitionMode_ = builder.acquisitionMode_;
         cameraMode_ = builder.cameraMode_;
-        primaryCamera_ = builder.primaryCamera_;
-        isAcqFromBothSides_ = builder.isAcqFromBothSides_;
+        imagingCameraOrder_ = builder.imagingCameraOrder_;
+        imagingCamerasActive_ = builder.imagingCamerasActive_;
+        useSimultaneousCameras_ = builder.useSimultaneousCameras_;
         useChannels_ = builder.useChannels_;
         useTimePoints_ = builder.useTimePoints_;
         useAutofocus_ = builder.useAutofocus_;
@@ -486,23 +501,33 @@ public CameraMode cameraMode() {
     }
 
     /**
-     * Returns the name of the primary camera.
+     * Returns the imaging camera order.
+     *
+     * @return the imaging camera order
+     */
+    @Override
+    public String[] imagingCameraOrder() {
+        return imagingCameraOrder_;
+    }
+
+    /**
+     * Returns an array of active imaging cameras.
      *
-     * @return the name of the primary camera
+     * @return an array of active imaging cameras
      */
     @Override
-    public String primaryCamera() {
-        return primaryCamera_;
+    public boolean[] imagingCamerasActive() {
+        return imagingCamerasActive_;
     }
 
     /**
-     * Returns true if acquiring from both imaging cameras.
+     * Returns true if acquiring from all active imaging cameras on a single view.
      *
-     * @return true if acquiring from both imaging cameras
+     * @return true if acquiring from all active imaging cameras on a single view
      */
     @Override
-    public boolean isAcqFromBothSides() {
-        return isAcqFromBothSides_;
+    public boolean isUsingSimultaneousCameras() {
+        return useSimultaneousCameras_;
     }
 
     /**

src/main/java/org/micromanager/lightsheetmanager/gui/components/RadioButton.java

@@ -31,11 +31,11 @@ public RadioButton(final String[] names, final String selected) {
         setSelected(selected, true);
     }
 
-    public RadioButton(final String[] names, final String selected, final int type, final int alignment) {
+    public RadioButton(final String[] names, final String selected, final int alignment) {
         setMigLayout("", "", "");
         buttonGroup = new ButtonGroup();
         buttons = new ArrayList<>();
-        setLayoutStyle(type, alignment);
+        setLayoutStyle(alignment, LEFT);
         addButtons(names);
         setSelected(selected, true);
     }