Changeset 7153


Ignore:
Timestamp:
11/04/10 10:49:29 (9 years ago)
Author:
melissa
Message:

Only populate LightPath references if the LSIDs are not null.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/FlexReader.java

    r7125 r7153  
    517517            if (index < filterSets.size()) { 
    518518              FilterGroup group = filterSetMap.get(filterSets.get(index)); 
    519               store.setLightPathEmissionFilterRef(group.emission, i, c, 0); 
    520               store.setLightPathExcitationFilterRef(group.excitation, i, c, 0); 
    521               store.setLightPathDichroicRef(group.dichroic, i, c); 
     519              if (group.emission != null) { 
     520                store.setLightPathEmissionFilterRef(group.emission, i, c, 0); 
     521              } 
     522              if (group.excitation != null) { 
     523                store.setLightPathExcitationFilterRef( 
     524                  group.excitation, i, c, 0); 
     525              } 
     526              if (group.dichroic != null) { 
     527                store.setLightPathDichroicRef(group.dichroic, i, c); 
     528              } 
    522529            } 
    523530          } 
  • trunk/components/bio-formats/src/loci/formats/in/FlexReader.java

    r7125 r7153  
    517517            if (index < filterSets.size()) { 
    518518              FilterGroup group = filterSetMap.get(filterSets.get(index)); 
    519               store.setLightPathEmissionFilterRef(group.emission, i, c, 0); 
    520               store.setLightPathExcitationFilterRef(group.excitation, i, c, 0); 
    521               store.setLightPathDichroicRef(group.dichroic, i, c); 
     519              if (group.emission != null) { 
     520                store.setLightPathEmissionFilterRef(group.emission, i, c, 0); 
     521              } 
     522              if (group.excitation != null) { 
     523                store.setLightPathExcitationFilterRef( 
     524                  group.excitation, i, c, 0); 
     525              } 
     526              if (group.dichroic != null) { 
     527                store.setLightPathDichroicRef(group.dichroic, i, c); 
     528              } 
    522529            } 
    523530          } 
Note: See TracChangeset for help on using the changeset viewer.