Changeset 6768


Ignore:
Timestamp:
08/05/10 11:17:33 (9 years ago)
Author:
melissa
Message:

Fixed several OME-XML validation issues. See #520.

Location:
trunk/components
Files:
6 edited

Legend:

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

    r6655 r6768  
    181181      store.setExperimenterFirstName(firstName, 0); 
    182182      store.setExperimenterLastName(lastName, 0); 
     183      store.setExperimenterDisplayName(lastName + ", " + firstName, 0); 
    183184 
    184185      for (int i=0; i<getSeriesCount(); i++) { 
  • trunk/components/bio-formats/src/loci/formats/in/LiFlimReader.java

    r6655 r6768  
    453453    for (int roi=0; roi<roiIndices.length; roi++) { 
    454454      ROI r = rois.get(roiIndices[roi]); 
     455      String polylineID = MetadataTools.createLSID("Shape", roi, 0); 
     456      store.setPolylineID(polylineID, roi, 0); 
    455457      store.setPolylinePoints(r.pointsToString(), roi, 0); 
    456458      store.setPolylineClosed(Boolean.TRUE, roi, 0); 
  • trunk/components/bio-formats/src/loci/formats/in/SBIGReader.java

    r6655 r6768  
    6868  /* @see loci.formats.IFormatReader#isThisType(RandomAccessInputStream) */ 
    6969  public boolean isThisType(RandomAccessInputStream stream) throws IOException { 
    70     final int blockLen = 32; 
     70    final int blockLen = (int) HEADER_SIZE; 
     71    final int checkLen = 32; 
    7172    if (!FormatTools.validStream(stream, blockLen, false)) return false; 
    72     return stream.readString(blockLen).indexOf("Image") > 0; 
     73    return stream.readString(checkLen).indexOf("Image") > 0; 
    7374  } 
    7475 
  • trunk/components/bio-formats/src/loci/formats/in/TillVisionReader.java

    r6741 r6768  
    459459 
    460460        if (i < types.size()) { 
     461          store.setExperimentID(MetadataTools.createLSID("Experiment", i), i); 
    461462          store.setExperimentType(getExperimentType(types.get(i)), i); 
    462463        } 
  • trunk/components/bio-formats/src/loci/formats/readers.txt

    r6758 r6768  
    112112 
    113113# TIFF-based readers with unique file extensions 
    114 loci.formats.in.MetamorphReader       # stk 
    115114loci.formats.in.ZeissLSMReader        # lsm, mdb [MDB Tools] 
    116115loci.formats.in.SEQReader             # seq 
     
    130129loci.formats.in.FluoviewReader        # tif 
    131130loci.formats.in.PrairieReader         # xml, cfg, tif 
     131loci.formats.in.MetamorphReader       # stk, tif, nd 
    132132loci.formats.in.MicromanagerReader    # txt, tif 
    133133loci.formats.in.ImprovisionTiffReader # tif 
  • trunk/components/test-suite/src/loci/tests/testng/FormatReaderTest.java

    r6751 r6768  
    453453        // if CreationDate is before 1995, it's probably invalid 
    454454        String date = retrieve.getImageAcquiredDate(i); 
    455         if (date != null && DateTools.getTime(date, DateTools.ISO8601_FORMAT) < 
    456           DateTools.getTime("1995-01-01T00:00:00", DateTools.ISO8601_FORMAT)) 
    457         { 
    458           msg = "CreationDate"; 
     455        if (date != null) { 
     456          long acquiredDate = DateTools.getTime(date, DateTools.ISO8601_FORMAT); 
     457          long saneDate = 
     458            DateTools.getTime("1995-01-01T00:00:00", DateTools.ISO8601_FORMAT); 
     459          long fileDate = new Location( 
     460            reader.getCurrentFile()).getAbsoluteFile().lastModified(); 
     461          if (acquiredDate < saneDate && fileDate >= saneDate) { 
     462            msg = "CreationDate"; 
     463          } 
    459464        } 
    460465      } 
Note: See TracChangeset for help on using the changeset viewer.