Merge pull request #166 from bls337/main

update numChannels when using the channel table
micro-manager · Oct 3, 2023 · a18a4ae · a18a4ae
2 parents 72ac25c + 61e8408
commit a18a4ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/channels/ChannelTablePanel.java
@@ -8,6 +8,7 @@
 import org.micromanager.lightsheetmanager.gui.components.Panel;
 import org.micromanager.lightsheetmanager.model.LightSheetManagerModel;
 import org.micromanager.lightsheetmanager.api.data.MultiChannelMode;
+import org.micromanager.lightsheetmanager.model.channels.ChannelSpec;
 
 import javax.swing.JLabel;
 import java.util.ArrayList;
@@ -79,14 +80,18 @@ private void createEventHandlers() {
 //            repaint();
             System.out.println("add channel");
             table_.getData().printChannelData();
-            asb.channels(table_.getData().getChannelArray());
+            final ChannelSpec[] channels = table_.getData().getChannelArray();
+            asb.channels(channels);
+            asb.numChannels(channels.length);
         });
 
         btnRemoveChannel_.registerListener(e -> {
             final int row = table_.getTable().getSelectedRow();
             if (row != -1) {
                 table_.getData().removeChannel(row);
-                asb.channels(table_.getData().getChannelArray());
+                final ChannelSpec[] channels = table_.getData().getChannelArray();
+                asb.channels(channels);
+                asb.numChannels(channels.length);
                 table_.refreshData();
                 System.out.println("remove row index: " + row);
             }

diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/channels/ChannelTableData.java b/src/main/java/org/micromanager/lightsheetmanager/model/channels/ChannelTableData.java
@@ -18,6 +18,7 @@ public ChannelTableData() {
 
     public ChannelTableData(final ChannelSpec[] channels, final String channelGroup) {
         channels_ = new ArrayList<>();
+        // TODO: Objects.requireNonNull
         if (channels != null) {
             Collections.addAll(channels_, channels);
         }