From 1010832560f368dec474e37b1e023086ccaf9302 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 2 May 2011 14:38:08 +0000
Subject: [PATCH] bug fixed
SVN: 21089
---
.../application/detailviewers/LogicalImageSeriesGrid.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageSeriesGrid.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageSeriesGrid.java
index 3cc0d6a458e..94e5556fdd8 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageSeriesGrid.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/LogicalImageSeriesGrid.java
@@ -488,16 +488,17 @@ class LogicalImageSeriesGrid
matrix = new ArrayList<List<ImageSeriesPoint>>();
Set<Integer> depthMapSizes = new HashSet<Integer>();
+ int depthLevelCount = 0;
for (Map<Float, ImageSeriesPoint> depthMap : values)
{
matrix.add(new ArrayList<ImageSeriesPoint>(depthMap.values()));
+ depthLevelCount = Math.max(depthLevelCount, depthMap.size());
depthMapSizes.add(depthMap.size());
}
- int depthMapSizesSize = depthMapSizes.size();
- numberOfDepthLevels = depthMapSizesSize == 0 ? 0 : depthMapSizes.iterator().next();
+ numberOfDepthLevels = depthLevelCount;
matrixViewPossible =
seriesNumberPresent == false && timepointOrDepthNotPresent == false
- && depthMapSizesSize == 1;
+ && depthMapSizes.size() == 1;
}
public ImageSeriesPoint get(int timeIndex, int depthIndex)
--
GitLab