Merge pull request #35 from henrypinkard/main

avoid exception when only some channels present
micro-manager · Sep 29, 2023 · 2bed0c8 · 2bed0c8
2 parents f535738 + 3d9f42e
commit 2bed0c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.ndviewer</groupId>
     <artifactId>NDViewer</artifactId>
-    <version>0.10.1</version>
+    <version>0.10.2</version>
     <packaging>jar</packaging>
     <name>NDViewer image viewer</name>
     <description>Java-based multidimensional image viewer</description>

diff --git a/src/main/java/org/micromanager/ndviewer/internal/gui/contrast/MultiChannelHistograms.java b/src/main/java/org/micromanager/ndviewer/internal/gui/contrast/MultiChannelHistograms.java
@@ -164,6 +164,9 @@ void updateHistogramData(HashMap<String, int[]> hists) {
          for (String i : hists.keySet()) {
             ChannelControlPanel c = ccpList_.get(i);
             int[] hist = hists.get(i);
+            if (hist == null) {
+               continue; // not provided for this channel
+            }
             c.updateHistogram(hist);
          }
       }