Merge pull request #334 from bls337/main

move channel settings into DefaultChannelSettings

Author: bls337

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

@@ -2,15 +2,13 @@
 
 import org.micromanager.lightsheetmanager.api.data.AcquisitionMode;
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
-import org.micromanager.lightsheetmanager.api.data.MultiChannelMode;
 import org.micromanager.lightsheetmanager.api.internal.DefaultScanSettings;
 import org.micromanager.lightsheetmanager.api.internal.DefaultSheetCalibration;
 import org.micromanager.lightsheetmanager.api.internal.DefaultSliceCalibration;
 import org.micromanager.lightsheetmanager.api.internal.DefaultSliceSettings;
 import org.micromanager.lightsheetmanager.api.internal.DefaultSliceSettingsLS;
 import org.micromanager.lightsheetmanager.api.internal.DefaultTimingSettings;
 import org.micromanager.lightsheetmanager.api.internal.DefaultVolumeSettings;
-import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 
 /**
  * Acquisition settings for SCAPE microscope geometries.
@@ -26,13 +24,6 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
          */
         T acquisitionMode(final AcquisitionMode acqMode);
 
-        /**
-         * Sets the channel mode.
-         *
-         * @param channelMode the channel mode.
-         */
-        T channelMode(final MultiChannelMode channelMode);
-
         /**
          * Sets the camera mode.
          *
@@ -103,20 +94,6 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
          */
         T postMoveDelay(final int postMoveDelay);
 
-        /**
-         * Sets the channel group.
-         *
-         * @param channelGroup the channel group.
-         */
-        T channelGroup(final String channelGroup);
-
-        /**
-         * Sets the channels array.
-         *
-         * @param channels the channel array
-         */
-        T channels(final ChannelSpec[] channels);
-
         /**
          * Sets the live scan period.
          *
@@ -187,7 +164,6 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
      * @return immutable DefaultSliceCalibration instance.
      */
     DefaultSliceCalibration sliceCalibration(final int view);
-    //DefaultSliceCalibration sliceCalibration();
 
     /**
      * Returns the acquisition mode.
@@ -196,13 +172,6 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
      */
     AcquisitionMode acquisitionMode();
 
-    /**
-     * Returns the channel mode.
-     *
-     * @return the channel mode.
-     */
-    MultiChannelMode channelMode();
-
     /**
      * Returns the camera mode.
      *
@@ -280,26 +249,5 @@ interface Builder<T extends AcquisitionSettings.Builder<T>> extends AcquisitionS
      */
     int postMoveDelay();
 
-    /**
-     * Returns the number of channels.
-     *
-     * @return the number of channels.
-     */
-    int numChannels();
-
-    /**
-     * Returns the channel group.
-     *
-     * @return the channel group.
-     */
-    String channelGroup();
-
-    /**
-     * Returns the channels as an array.
-     *
-     * @return the channels as an array.
-     */
-    ChannelSpec[] channels();
-
     double liveScanPeriod();
 }

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

@@ -1,14 +1,17 @@
 package org.micromanager.lightsheetmanager.api;
 
+import org.micromanager.lightsheetmanager.api.data.MultiChannelMode;
 import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 
 public interface ChannelSettings {
 
     interface Builder {
 
-        Builder channelGroup(final String channelGroup);
+        Builder channelGroup(final String group);
 
-        Builder channels();
+        Builder channelMode(final MultiChannelMode mode);
+
+        Builder channels(final ChannelSpec[] channels);
 
         ChannelSettings build();
     }
@@ -19,6 +22,8 @@ interface Builder {
 
     String channelGroup();
 
+    MultiChannelMode channelMode();
+
     String[] channelGroups();
 
     ChannelSpec[] channels();

src/main/java/org/micromanager/lightsheetmanager/api/data/CameraMode.java

@@ -47,7 +47,7 @@ public static String[] toArray() {
      * Does camera support overlap/synchronous mode?
      *
      * @param camLib the camera device adapter
-     * @return
+     * @return {@code true} if the camera supports the mode
      */
     public static boolean hasOverlapTrigger(final CameraLibrary camLib) {
         return camLib == CameraLibrary.HAMAMATSU ||
@@ -60,7 +60,7 @@ public static boolean hasOverlapTrigger(final CameraLibrary camLib) {
      * Both PCO and Photometrics 95B do (PCO panda seems to be exception but can't easily account for that)
      *
      * @param camLib the camera device adapter
-     * @return
+     * @return {@code true} if the camera supports the mode
      */
     private static boolean hasPseudoOverlapTrigger(CameraLibrary camLib) {
         return camLib == CameraLibrary.PCOCAMERA || camLib == CameraLibrary.PVCAM;
@@ -76,7 +76,7 @@ private static boolean hasLevelTrigger(CameraLibrary camLib) {
      * Does camera support light sheet mode?
      *
      * @param camLib the camera device adapter
-     * @return
+     * @return {@code true} if the camera supports the mode
      */
     private static boolean hasLightSheetTrigger(CameraLibrary camLib) {
         return camLib == CameraLibrary.HAMAMATSU ||