Merge pull request #1843 from melissalinkert/metamorph-backports

Metamorph: fix Z and T settings when the .nd file is inconsistent
ome · Jun 24, 2015 · c187ec9 · c187ec9
2 parents 07f6ece + ad0342a
commit c187ec9
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/components/formats-gpl/src/loci/formats/in/MetamorphReader.java b/components/formats-gpl/src/loci/formats/in/MetamorphReader.java
@@ -499,6 +499,12 @@ else if (key.equals("DoZSeries")) {
         currentValue.append(line.substring(comma + 1).trim());
       }
 
+      if (!globalDoZ) {
+        for (int i=0; i<hasZ.size(); i++) {
+          hasZ.set(i, false);
+        }
+      }
+
       // figure out how many files we need
 
       if (z != null) zc = Integer.parseInt(z);
@@ -512,6 +518,9 @@ else if (!doTimelapse) {
       if (cc == 1 && bizarreMultichannelAcquisition) {
         cc = 2;
       }
+      if (tc == 0) {
+        tc = 1;
+      }
 
       int numFiles = cc * tc;
       if (nstages > 0) numFiles *= nstages;