Changeset 4769


Ignore:
Timestamp:
02/02/09 09:25:39 (11 years ago)
Author:
melissa
Message:

Fixed a couple of metadata population bugs; closes #340.

File:
1 edited

Legend:

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

    r4765 r4769  
    433433    store.setDimensionsPhysicalSizeZ(new Float(stepSize), 0, 0); 
    434434 
    435     for (int i=0; i<getSizeC(); i++) { 
     435    for (int i=0; i<getEffectiveSizeC(); i++) { 
    436436      if (waveNames != null && i < waveNames.size()) { 
    437437        store.setLogicalChannelName((String) waveNames.get(i), 0, i); 
     
    453453 
    454454      int index = getIndex(0, i, 0); 
    455       store.setLightSourceSettingsWavelength( 
    456         new Integer((int) wave[index]), 0, i); 
     455      if (index < wave.length && (int) wave[index] >= 1) { 
     456        store.setLightSourceSettingsWavelength( 
     457          new Integer((int) wave[index]), 0, i); 
     458      } 
    457459    } 
    458460    store.setDetectorID("Detector:0", 0, 0); 
Note: See TracChangeset for help on using the changeset viewer.