Changeset 6676


Ignore:
Timestamp:
07/08/10 16:29:26 (9 years ago)
Author:
curtis
Message:

Fix bug with dimensional extents between multiple series.

Location:
trunk/components/loci-plugins/src/loci/plugins/in
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/loci-plugins/src/loci/plugins/in/ImagePlusReader.java

    r6659 r6676  
    205205 
    206206  private List<ImagePlus> readImages() throws FormatException, IOException { 
     207    final ImporterOptions options = process.getOptions(); 
    207208    final ImageProcessorReader reader = process.getReader(); 
    208     final ImporterOptions options = process.getOptions(); 
    209209 
    210210    List<ImagePlus> imps = new ArrayList<ImagePlus>(); 
     
    273273      imp = vip; 
    274274    } 
    275     else { 
    276       imp = createImage(title, stack, luts); 
    277     } 
    278    
     275    else imp = createImage(title, stack, luts); 
     276 
    279277    // configure image 
    280278 
     
    300298    throws FormatException, IOException 
    301299  { 
     300    final ImporterOptions options = process.getOptions(); 
    302301    final ImageProcessorReader reader = process.getReader(); 
    303     final ImporterOptions options = process.getOptions(); 
    304  
     302    reader.setSeries(s); 
    305303    final int zCount = process.getZCount(s); 
    306304    final int cCount = process.getCCount(s); 
     
    325323    final ImageProcessorReader reader = process.getReader(); 
    326324    reader.setSeries(s); 
    327  
    328325    final int zCount = process.getZCount(s); 
    329326    final int cCount = process.getCCount(s); 
     
    362359      } 
    363360    } 
    364      
     361 
    365362    return createStack(procs, labels, luts); 
    366363  } 
  • trunk/components/loci-plugins/src/loci/plugins/in/ImportProcess.java

    r6673 r6676  
    283283    int cEnd = options.getCEnd(s); 
    284284    if (cEnd >= 0) return cEnd; 
     285    reader.setSeries(s); 
    285286    return reader.getEffectiveSizeC() - 1; 
    286287  } 
     
    293294    int zEnd = options.getZEnd(s); 
    294295    if (zEnd >= 0) return zEnd; 
     296    reader.setSeries(s); 
    295297    return reader.getSizeZ() - 1; 
    296298  } 
     
    303305    int tEnd = options.getTEnd(s); 
    304306    if (tEnd >= 0) return tEnd; 
     307    reader.setSeries(s); 
    305308    return reader.getSizeT() - 1; 
    306309  } 
     
    312315    assertStep(ImportStep.STACK); 
    313316    Region region = options.doCrop() ? options.getCropRegion(s) : null; 
    314     ImageProcessorReader r = getReader(); 
    315     int sizeX = r.getSizeX(), sizeY = r.getSizeY(); 
     317    reader.setSeries(s); 
     318    int sizeX = reader.getSizeX(), sizeY = reader.getSizeY(); 
    316319    if (region == null) { 
    317320      // entire image plane is the default region 
     
    362365    for (int s=0; s<seriesCount; s++) { 
    363366      if (!options.isSeriesOn(s)) continue; 
     367      reader.setSeries(s); 
    364368      // determine size of one image plane 
    365369      final Region cropRegion = getCropRegion(s); 
Note: See TracChangeset for help on using the changeset viewer.