Changeset 6389


Ignore:
Timestamp:
05/25/10 19:31:54 (10 years ago)
Author:
melissa
Message:

Prevent each EmissionFilterRef from being populated multiple times.

Files:
2 edited

Legend:

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

    r6376 r6389  
    161161  private boolean[][] cutInPopulated; 
    162162  private boolean[][] cutOutPopulated; 
     163  private boolean[][] filterRefPopulated; 
    163164 
    164165  // -- Constructor -- 
     
    297298      cutInPopulated = null; 
    298299      cutOutPopulated = null; 
     300      filterRefPopulated = null; 
    299301    } 
    300302  } 
     
    400402    cutInPopulated = new boolean[getSeriesCount()][]; 
    401403    cutOutPopulated = new boolean[getSeriesCount()][]; 
     404    filterRefPopulated = new boolean[getSeriesCount()][]; 
    402405 
    403406    for (int i=0; i<getSeriesCount(); i++) { 
     
    573576      cutInPopulated[i] = new boolean[core[i].sizeC]; 
    574577      cutOutPopulated[i] = new boolean[core[i].sizeC]; 
     578      filterRefPopulated[i] = new boolean[core[i].sizeC]; 
    575579 
    576580      Integer[] keys = ifd.keySet().toArray(new Integer[ifd.size()]); 
     
    12131217          int index = activeChannelIndices.indexOf(new Integer(channel)); 
    12141218          if (index >= 0 && index < core[series].sizeC) { 
    1215             store.setLightPathEmissionFilterRef(filterID, series, index, 0); 
     1219            if (!filterRefPopulated[series][index]) { 
     1220              store.setLightPathEmissionFilterRef(filterID, series, index, 0); 
     1221              filterRefPopulated[series][index] = true; 
     1222            } 
    12161223 
    12171224            if (tokens[3].equals("0") && !cutInPopulated[series][index]) { 
  • trunk/components/bio-formats/src/loci/formats/in/LeicaReader.java

    r6377 r6389  
    161161  private boolean[][] cutInPopulated; 
    162162  private boolean[][] cutOutPopulated; 
     163  private boolean[][] filterRefPopulated; 
    163164 
    164165  // -- Constructor -- 
     
    297298      cutInPopulated = null; 
    298299      cutOutPopulated = null; 
     300      filterRefPopulated = null; 
    299301    } 
    300302  } 
     
    400402    cutInPopulated = new boolean[getSeriesCount()][]; 
    401403    cutOutPopulated = new boolean[getSeriesCount()][]; 
     404    filterRefPopulated = new boolean[getSeriesCount()][]; 
    402405 
    403406    for (int i=0; i<getSeriesCount(); i++) { 
     
    573576      cutInPopulated[i] = new boolean[core[i].sizeC]; 
    574577      cutOutPopulated[i] = new boolean[core[i].sizeC]; 
     578      filterRefPopulated[i] = new boolean[core[i].sizeC]; 
    575579 
    576580      Integer[] keys = ifd.keySet().toArray(new Integer[ifd.size()]); 
     
    12131217          int index = activeChannelIndices.indexOf(new Integer(channel)); 
    12141218          if (index >= 0 && index < core[series].sizeC) { 
    1215             store.setLightPathEmissionFilterRef(filterID, series, index, 0); 
     1219            if (!filterRefPopulated[series][index]) { 
     1220              store.setLightPathEmissionFilterRef(filterID, series, index, 0); 
     1221              filterRefPopulated[series][index] = true; 
     1222            } 
    12161223 
    12171224            if (tokens[3].equals("0") && !cutInPopulated[series][index]) { 
Note: See TracChangeset for help on using the changeset viewer.