consolidate ui

src/main/java/org/micromanager/lightsheetmanager/gui/tabs/AcquisitionTab.java

@@ -186,7 +186,7 @@ private void createUserInterface() {
         // set ui sizes, should match the MigLayout constraints
         pnlChannelTable_.setAbsoluteSize(280, 400);
         pnlLeft.setAbsoluteSize(300, 580);
-        pnlRight_.setAbsoluteSize(300, 420);
+        pnlRight_.setAbsoluteSize(300, 580);
 
         // acquisition buttons
         pnlButtons_.add(btnRunAcquisition_, "");
@@ -208,8 +208,8 @@ private void createUserInterface() {
         pnlCenter.add(cmbAcquisitionModes_, "");
 
         pnlRight_.add(pnlVolumeSettings_, "growx, wrap");
-        pnlRight_.add(model_.acquisitions().settings().isUsingAdvancedTiming() ?
-                pnlAdvancedTiming_ : pnlSliceSettings_, "growx, wrap");
+        pnlRight_.add(pnlSliceSettings_, "growx, wrap");
+        pnlRight_.add(pnlAdvancedTiming_, "growx, wrap");
         pnlRight_.add(cbxUseAdvancedTiming_, "growx");
 
         // add panels
@@ -299,13 +299,8 @@ private void createEventHandlers() {
      * @param useAdvancedTiming {@code true} to swap to the advanced timing panel
      */
     private void swapTimingSettingsPanels(final boolean useAdvancedTiming) {
-        pnlRight_.removeAll();
-        pnlRight_.add(pnlVolumeSettings_, "growx, wrap");
-        pnlRight_.add(useAdvancedTiming ?
-                pnlAdvancedTiming_ : pnlSliceSettings_, "growx, wrap");
-        pnlRight_.add(cbxUseAdvancedTiming_, "growx");
-        pnlRight_.revalidate();
-        pnlRight_.repaint();
+        pnlAdvancedTiming_.setPanelEnabled(useAdvancedTiming);
+        pnlSliceSettings_.setPanelEnabled(!useAdvancedTiming);
     }
 
     public PositionPanel getMultiPositionPanel() {

src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SettingsTab.java

@@ -2,6 +2,7 @@
 
 import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.api.internal.ScapeAcquisitionSettings;
+import org.micromanager.lightsheetmanager.gui.components.Button;
 import org.micromanager.lightsheetmanager.gui.components.CheckBox;
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
@@ -28,6 +29,8 @@ public class SettingsTab extends Panel implements ListeningPanel {
     private Spinner spnSliceAxisFilterFreq_;
     private Spinner spnLiveScanPeriod_;
 
+    private Button btnCreateConfigGroup_;
+
     // changes the ui setup
     private boolean isUsingPLogic_;
     private boolean isUsingScanSettings_;
@@ -47,6 +50,21 @@ private void createUserInterface() {
         isUsingPLogic_ = model_.devices().isUsingPLogic();
         isUsingScanSettings_ = model_.devices().hasStageScanning();
 
+        btnCreateConfigGroup_ = new Button("Create Devices Configuration Group", 220, 30);
+        btnCreateConfigGroup_.setToolTipText("Creates or updates the \"System::Startup\" configuration " +
+                "group with all editable properties from the Light Sheet Manager device adapter.");
+
+        final JLabel lblGeometryType = new JLabel("Microscope Geometry: "
+                + model_.devices().adapter().geometry());
+        final JLabel lblLightSheetType = new JLabel("Light Sheet Type: "
+                + model_.devices().adapter().lightSheetType());
+        final JLabel lblNumImagingPaths = new JLabel("Imaging Paths: "
+                + model_.devices().adapter().numImagingPaths());
+        final JLabel lblNumIlluminationPaths = new JLabel("Illumination Paths: "
+                + model_.devices().adapter().numIlluminationPaths());
+        final JLabel lblNumSimultaneousCameras = new JLabel("Simultaneous Cameras: "
+                + model_.devices().adapter().numSimultaneousCameras());
+
         final Panel pnlScanSettings = new Panel("Stage Scan Settings");
         pnlScanSettings.setMigLayout(
                 "",
@@ -99,6 +117,12 @@ private void createUserInterface() {
         spnSliceAxisFilterFreq_ = Spinner.createDoubleSpinner(0.4, 0.1, 1.0, 0.1);
         spnLiveScanPeriod_ = Spinner.createIntegerSpinner(20, 2, 10000, 100);
 
+        add(lblGeometryType, "wrap");
+        add(lblLightSheetType, "wrap");
+        add(lblNumImagingPaths, "wrap");
+        add(lblNumIlluminationPaths, "wrap");
+        add(lblNumSimultaneousCameras, "wrap");
+
         // scan settings panel
         if (isUsingScanSettings_) {
             pnlScanSettings.add(lblScanAcceleration, "");
@@ -134,6 +158,8 @@ private void createUserInterface() {
         if (isUsingPLogic_) {
             add(pnlLightSheet, "growx");
         }
+
+        add(btnCreateConfigGroup_, "gaptop 40");
     }
 
     private void createEventHandlers() {
@@ -175,6 +201,8 @@ private void createEventHandlers() {
                     () -> scanner.setFilterFreqY(spnSliceAxisFilterFreq_.getDouble()));
         }
 
+        btnCreateConfigGroup_.registerListener(() -> model_.devices().createConfigGroup());
+
         // TODO: make this work with diSPIM settings
 //        spnLiveScanPeriod_.registerListener(
 //                e -> model_.acquisitions().settingsBuilder()

src/main/java/org/micromanager/lightsheetmanager/gui/tabs/SetupPathTab.java

@@ -1,6 +1,7 @@
 package org.micromanager.lightsheetmanager.gui.tabs;
 
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
+import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.gui.components.Label;
 import org.micromanager.lightsheetmanager.gui.components.ListeningPanel;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
@@ -24,7 +25,8 @@ public SetupPathTab(final LightSheetManager model, final int pathNum) {
     }
 
     private void createUserInterface() {
-        final String title = "Setup Path " + pathNum_;
+        final String title = (model_.devices().adapter().numImagingPaths() > 1)
+                ? ("Setup Path " + pathNum_) : "Setup Path";
         final Label lblTitle = new Label(title, Font.BOLD, 16);
 
         setupPanel_ = new SetupPanel(model_, pathNum_);

src/main/java/org/micromanager/lightsheetmanager/gui/tabs/TabPanel.java

@@ -3,6 +3,7 @@
 import org.micromanager.lightsheetmanager.api.data.CameraMode;
 import org.micromanager.lightsheetmanager.LightSheetManagerFrame;
 import org.micromanager.lightsheetmanager.LightSheetManager;
+import org.micromanager.lightsheetmanager.api.data.GeometryType;
 import org.micromanager.lightsheetmanager.model.DeviceManager;
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.gui.components.TabbedPane;
@@ -19,10 +20,8 @@ public class TabPanel extends Panel {
     private NavigationTab navigationTab_;
     private AcquisitionTab acquisitionTab_;
     private AutofocusTab autofocusTab_;
-    private DeviceTab deviceTab_;
     private CameraTab cameraTab_;
     private SettingsTab settingsTab_;
-    private HelpTab helpTab_;
     private ArrayList<SetupPathTab> setupPathTabs_;
 
     private final TabbedPane tabbedPane_;
@@ -55,9 +54,7 @@ private void createUserInterface() {
         acquisitionTab_ = new AcquisitionTab(model_, frame_);
         autofocusTab_ = new AutofocusTab(model_);
         cameraTab_ = new CameraTab(model_);
-        deviceTab_ = new DeviceTab(model_);
         settingsTab_ = new SettingsTab(model_);
-        helpTab_ = new HelpTab();
 
         // add tabs to the pane
         tabbedPane_.addTab(createTabTitle("Navigation"), navigationTab_);
@@ -66,16 +63,18 @@ private void createUserInterface() {
         final int numImagingPaths = devices_.adapter().numImagingPaths();
         for (int i = 0; i < numImagingPaths; i++) {
             SetupPathTab setupPathTab = new SetupPathTab(model_, i + 1);
-            tabbedPane_.add(createTabTitle("Setup Path " + (i + 1)), setupPathTab);
+            if (numImagingPaths > 1) {
+                tabbedPane_.add(createTabTitle("Setup Path " + (i + 1)), setupPathTab);
+            } else {
+                tabbedPane_.add(createTabTitle("Setup Path"), setupPathTab);
+            }
             setupPathTabs_.add(setupPathTab);
         }
 
         tabbedPane_.addTab(createTabTitle("Acquisition"), acquisitionTab_);
         tabbedPane_.addTab(createTabTitle("Autofocus"), autofocusTab_);
         tabbedPane_.addTab(createTabTitle("Cameras"), cameraTab_);
-        tabbedPane_.addTab(createTabTitle("Devices"), deviceTab_);
         tabbedPane_.addTab(createTabTitle("Settings"), settingsTab_);
-        tabbedPane_.addTab(createTabTitle("Help"), helpTab_);
 
         // set acquisition tab to default
         tabbedPane_.setSelectedIndex(numImagingPaths + 1);
@@ -114,10 +113,6 @@ public AcquisitionTab getAcquisitionTab() {
         return acquisitionTab_;
     }
 
-    public DeviceTab getDeviceTab() {
-        return deviceTab_;
-    }
-
     public CameraTab getCameraTab() {
         return cameraTab_;
     }