Changeset 2209


Ignore:
Timestamp:
02/02/07 07:55:50 (13 years ago)
Author:
melissa
Message:

Tweaked dimension ordering.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/ZeissZVIReader.java

    r2182 r2209  
    404404      Object check = getMeta("Image Channel Index"); 
    405405      if (check != null && !check.toString().trim().equals("")) { 
     406        String zIndex = (String) getMeta("Image Index Z"); 
     407        String tIndex = (String) getMeta("Image Index T"); 
     408 
    406409        int[] dims = {sizeZ[0], sizeC[0], sizeT[0]}; 
    407410        int max = 0, min = Integer.MAX_VALUE, maxNdx = 0, minNdx = 0; 
     
    425428 
    426429        currentOrder[0] = "XY" + axes[maxNdx] + axes[medNdx] + axes[minNdx]; 
     430        
     431        if (zIndex != null && tIndex != null) { 
     432          int z = Integer.parseInt(DataTools.stripString(zIndex)); 
     433          int t = Integer.parseInt(DataTools.stripString(tIndex)); 
     434 
     435          if (z != sizeZ[0]) { 
     436            if (sizeZ[0] != 1) { 
     437              currentOrder[0] = currentOrder[0].replaceAll("Z", "") + "Z"; 
     438            } 
     439            else currentOrder[0] = currentOrder[0].replaceAll("T", "") + "T"; 
     440          } 
     441        } 
     442 
    427443        if (sizeZ[0] == sizeC[0] && sizeC[0] == sizeT[0]) { 
    428444          currentOrder[0] = legacy.getDimensionOrder(id); 
Note: See TracChangeset for help on using the changeset viewer.