Changeset 2854


Ignore:
Timestamp:
06/11/07 08:08:12 (12 years ago)
Author:
melissa
Message:

Open images from the correct TIFF file.

File:
1 edited

Legend:

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

    r2808 r2854  
    6666      throw new FormatException("Invalid image number: " + no); 
    6767    } 
     68    tiffReader.setId((String) tiffs.get(no));  
    6869    return tiffReader.openBytes(0); 
    6970  } 
     
    7778      throw new FormatException("Invalid image number: " + no); 
    7879    } 
     80    tiffReader.setId((String) tiffs.get(no));  
    7981    return tiffReader.openBytes(0, buf); 
    8082  } 
     
    8688      throw new FormatException("Invalid image number: " + no); 
    8789    } 
     90    tiffReader.setId((String) tiffs.get(no));  
    8891    return tiffReader.openImage(0); 
    8992  } 
     
    200203    } 
    201204    tiffReader.setId((String) tiffs.get(0)); 
    202     core.sizeZ[0] = 1; 
    203     core.sizeT[0] = tiffs.size() / core.sizeC[0]; 
     205    
     206    String z = (String) metadata.get("Slices"); 
     207    if (z != null) { 
     208      core.sizeZ[0] = Integer.parseInt(z); 
     209    } 
     210    else core.sizeZ[0] = 1; 
     211 
     212    String t = (String) metadata.get("Frames"); 
     213    if (t != null) { 
     214      core.sizeT[0 ] = Integer.parseInt(t); 
     215    }  
     216    else core.sizeT[0] = tiffs.size() / core.sizeC[0]; 
     217     
    204218    core.sizeX[0] = tiffReader.getSizeX(); 
    205219    core.sizeY[0] = tiffReader.getSizeY(); 
    206     core.currentOrder[0] = "XYCTZ"; 
     220    core.currentOrder[0] = "XYZCT"; 
    207221    core.pixelType[0] = tiffReader.getPixelType(); 
    208222    core.rgb[0] = tiffReader.isRGB(); 
Note: See TracChangeset for help on using the changeset viewer.