Changeset 5607 for branches/4.1


Ignore:
Timestamp:
10/15/09 16:15:59 (11 years ago)
Author:
melissa
Message:

A few OME-XML validation fixes.

Location:
branches/4.1/components/bio-formats/src/loci/formats/in
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1/components/bio-formats/src/loci/formats/in/ICSReader.java

    r5575 r5607  
    831831        store.setLogicalChannelPinholeSize(pinholes.get(channel), 0, i); 
    832832      } 
    833       if (emWaves != null && i < emWaves.length) { 
     833      if (emWaves != null && i < emWaves.length && emWaves[i].intValue() > 0) { 
    834834        store.setLogicalChannelEmWave(emWaves[i], 0, i); 
    835835      } 
    836       if (exWaves != null && i < exWaves.length) { 
     836      if (exWaves != null && i < exWaves.length && exWaves[i].intValue() > 0) { 
    837837        store.setLogicalChannelExWave(exWaves[i], 0, i); 
    838838      } 
     
    845845      store.setLaserWavelength(wavelengths.get(lasers[i]), 0, 
    846846        lasers[i].intValue()); 
     847      store.setLaserType("Unknown", 0, lasers[i].intValue()); 
     848      store.setLaserLaserMedium("Unknown", 0, lasers[i].intValue()); 
    847849    } 
    848850 
  • branches/4.1/components/bio-formats/src/loci/formats/in/NikonTiffReader.java

    r5517 r5607  
    229229 
    230230    for (int i=0; i<wavelength.size(); i++) { 
    231       store.setLightSourceID("Laser:" + laserIDs.get(i), 0, i); 
     231      store.setLightSourceID("LightSource:" + laserIDs.get(i), 0, i); 
    232232      store.setLaserWavelength(wavelength.get(i), 0, i); 
     233      store.setLaserType("Unknown", 0, i); 
     234      store.setLaserLaserMedium("Unknown", 0, i); 
    233235    } 
    234236 
    235237    for (int i=0; i<gain.size(); i++) { 
    236238      store.setDetectorGain(gain.get(i), 0, i); 
     239      store.setDetectorType("Unknown", 0, i); 
    237240    } 
    238241 
     
    248251 
    249252    for (int i=0; i<filterModels.size(); i++) { 
    250       store.setFilterID("Filter:" + filterModels.get(i), 0, i); 
     253      String filter = MetadataTools.createLSID("Filter", 0, i); 
     254      store.setFilterID(filter, 0, i); 
    251255      store.setFilterModel(filterModels.get(i), 0, i); 
    252256    } 
    253257 
    254258    for (int i=0; i<dichroicModels.size(); i++) { 
    255       store.setDichroicID("Dichroic:" + dichroicModels.get(i), 0, i); 
     259      String dichroic = MetadataTools.createLSID("Dichroic", 0, i); 
     260      store.setDichroicID(dichroic, 0, i); 
    256261      store.setDichroicModel(dichroicModels.get(i), 0, i); 
    257262    } 
Note: See TracChangeset for help on using the changeset viewer.