Changeset 6782


Ignore:
Timestamp:
08/09/10 13:20:01 (9 years ago)
Author:
melissa
Message:

Parse physical pixel sizes for all series, instead of applying the first series' sizes to all series.

File:
1 edited

Legend:

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

    r6778 r6782  
    344344    // determine total number of pixel bytes 
    345345 
    346     float pixelSize = 1; 
     346    Vector<Float> pixelSize = new Vector<Float>(); 
    347347    String objective = null; 
    348348    Vector<Double> pixelSizeZ = new Vector<Double>(); 
     
    457457          objective = in.readCString(); 
    458458          in.seek(fp + 144); 
    459           pixelSize = in.readFloat(); 
     459          pixelSize.add(in.readFloat()); 
    460460        } 
    461461        else if (n == 'e') { 
     
    545545 
    546546      for (int i=0; i<getSeriesCount(); i++) { 
    547         store.setPixelsPhysicalSizeX(new Double(pixelSize), i); 
    548         store.setPixelsPhysicalSizeY(new Double(pixelSize), i); 
     547        if (i < pixelSize.size()) { 
     548          store.setPixelsPhysicalSizeX(new Double(pixelSize.get(i)), i); 
     549          store.setPixelsPhysicalSizeY(new Double(pixelSize.get(i)), i); 
     550        } 
    549551        int idx = 0; 
    550552        for (int q=0; q<i; q++) { 
Note: See TracChangeset for help on using the changeset viewer.