Changeset 6945


Ignore:
Timestamp:
09/15/10 12:01:36 (9 years ago)
Author:
melissa
Message:

Parse 'waitTime' from Prairie datasets. Closes #551.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/PrairieReader.java

    r6886 r6945  
    9393  private String immersion; 
    9494  private Double lensNA; 
     95  private Double waitTime; 
    9596 
    9697  private Vector<Double> deltaT = new Vector<Double>(); 
     
    229230      channels.clear(); 
    230231      zoom = null; 
     232      waitTime = null; 
    231233    } 
    232234  } 
     
    272274 
    273275      core[0].sizeT = getImageCount() / (getSizeZ() * getSizeC()); 
     276 
     277      boolean minimumMetadata = 
     278        getMetadataOptions().getMetadataLevel() == MetadataLevel.MINIMUM; 
     279      MetadataStore store = makeFilterMetadata(); 
    274280 
    275281      if (checkSuffix(id, XML_SUFFIX)) { 
     
    293299        core[0].indexed = tiff.isIndexed(); 
    294300        core[0].falseColor = false; 
    295  
    296         boolean minimumMetadata = 
    297           getMetadataOptions().getMetadataLevel() == MetadataLevel.MINIMUM; 
    298  
    299         MetadataStore store = makeFilterMetadata(); 
    300         MetadataTools.populatePixels(store, this, !minimumMetadata); 
    301  
    302301        if (date != null) { 
    303302          date = DateTools.formatDate(date, "MM/dd/yyyy h:mm:ss a"); 
     
    305304        } 
    306305        else MetadataTools.setDefaultCreationDate(store, id, 0); 
     306 
     307        MetadataTools.populatePixels(store, this, !minimumMetadata); 
    307308 
    308309        if (!minimumMetadata) { 
     
    366367          } 
    367368        } 
     369      } 
     370      else if (checkSuffix(id, CFG_SUFFIX)) { 
     371        store.setPixelsTimeIncrement(waitTime, 0); 
    368372      } 
    369373 
     
    511515        } 
    512516      } 
     517      else if (qName.equals("PVTSeriesElementWait")) { 
     518        waitTime = new Double(attributes.getValue("waitTime")); 
     519      } 
    513520    } 
    514521  } 
Note: See TracChangeset for help on using the changeset viewer.