Changeset 2529


Ignore:
Timestamp:
04/02/07 11:14:47 (13 years ago)
Author:
melissa
Message:

Reset variables related to sub-channel logic in multi-series readers.

Location:
trunk/loci/formats/in
Files:
6 edited

Legend:

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

    r2523 r2529  
    524524    Arrays.fill(orderCertain, true); 
    525525    validBits = new int[numDatasets][1]; 
     526    cLengths = new int[numDatasets][]; 
     527    cTypes = new String[numDatasets][]; 
    526528 
    527529    for (int i=0; i<numDatasets; i++) { 
  • trunk/loci/formats/in/LeicaReader.java

    r2523 r2529  
    3737 * @author Melissa Linkert linkert at wisc.edu 
    3838 */ 
    39 public class LeicaReader extends BaseTiffReader { 
     39public class LeicaReader extends FormatReader { 
    4040 
    4141  // -- Constants - 
     
    4545 
    4646  // -- Fields -- 
     47 
     48  /** Current file. */ 
     49  protected RandomAccessStream in; 
     50 
     51  protected Hashtable[] ifds; 
    4752 
    4853  /** Flag indicating whether current file is little endian. */ 
     
    376381      // parse the LEI file 
    377382 
    378       if (metadata == null) { 
    379         currentId = id; 
    380         metadata = new Hashtable(); 
    381       } 
    382       else { 
    383         if (currentId != id) currentId = id; 
    384       } 
     383      super.initFile(id); 
    385384 
    386385      leiFilename = id; 
     
    436435      files = new Vector[numSeries]; 
    437436      numPlanes = new int[numSeries]; 
     437      cLengths = new int[numSeries][]; 
     438      cTypes = new String[numSeries][]; 
    438439 
    439440      v.copyInto(headerIFDs); 
     
    11501151      String description = (String) getMeta("Image Description"); 
    11511152 
    1152       SimpleDateFormat parse = new SimpleDateFormat("yyyy:MM:dd,HH:mm:ss:SSS"); 
    1153       Date date = parse.parse(timestamp, new ParsePosition(0)); 
    1154       SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); 
    1155       timestamp = fmt.format(date); 
     1153      if (timestamp != null) { 
     1154        SimpleDateFormat parse =  
     1155          new SimpleDateFormat("yyyy:MM:dd,HH:mm:ss:SSS"); 
     1156        Date date = parse.parse(timestamp, new ParsePosition(0)); 
     1157        SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); 
     1158        timestamp = fmt.format(date); 
     1159      } 
    11561160 
    11571161      store.setImage(null, timestamp, description, ii); 
  • trunk/loci/formats/in/OIBReader.java

    r2523 r2529  
    405405      sizeT = new int[numSeries]; 
    406406      validBits = new int[numSeries][]; 
     407      cTypes = new String[numSeries][]; 
     408      cLengths = new int[numSeries][];  
    407409 
    408410      for (int i=0; i<numSeries; i++) { 
  • trunk/loci/formats/in/OMEXMLReader.java

    r2523 r2529  
    412412    order = new String[numDatasets]; 
    413413    pixelType = new int[numDatasets]; 
     414    cLengths = new int[numDatasets][]; 
     415    cTypes = new String[numDatasets][]; 
    414416 
    415417    int oldSeries = getSeries(currentId); 
  • trunk/loci/formats/in/OpenlabReader.java

    r2523 r2529  
    685685    orderCertain = new boolean[numSeries]; 
    686686    Arrays.fill(orderCertain, true); 
     687    cLengths = new int[numSeries][]; 
     688    cTypes = new String[numSeries][]; 
    687689 
    688690    int oldSeries = getSeries(currentId); 
  • trunk/loci/formats/in/TiffReader.java

    r2519 r2529  
    140140        currentOrder = new String[tiffData.length]; 
    141141        orderCertain = new boolean[tiffData.length]; 
     142        cLengths = new int[tiffData.length][]; 
     143        cTypes = new String[tiffData.length][]; 
    142144        Arrays.fill(orderCertain, true); 
    143145 
Note: See TracChangeset for help on using the changeset viewer.