From 3d9f42ee9c4466b276cf8b198126d3ce21745324 Mon Sep 17 00:00:00 2001
From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com>
Date: Fri, 29 Sep 2023 10:13:13 -0700
Subject: [PATCH] avoid exception when only some channels present
---
pom.xml | 2 +-
.../ndviewer/internal/gui/contrast/MultiChannelHistograms.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 987511a..9cc1b38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
org.micro-manager.ndviewer
NDViewer
- 0.10.1
+ 0.10.2
jar
NDViewer image viewer
Java-based multidimensional image viewer
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
index 30a40b6..f34c3be 100644
--- 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 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);
}
}