Changeset 2323


Ignore:
Timestamp:
02/23/07 10:23:03 (13 years ago)
Author:
melissa
Message:

Bugfixes.

Location:
trunk/loci/formats/in
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/LeicaReader.java

    r2320 r2323  
    632632      if (debug) exc.printStackTrace(); 
    633633    } 
     634    catch (ClassCastException exc) { 
     635      if (debug) exc.printStackTrace(); 
     636    } 
    634637    return false; 
    635638  } 
  • trunk/loci/formats/in/ND2Reader.java

    r2320 r2323  
    497497    else currentOrder[0] += "CZT"; 
    498498 
     499    // we calculate this directly (instead of calling getEffectiveSizeC) because 
     500    // sizeZ and sizeT have not been accurately set yet 
     501    int effectiveC = (sizeC[0] / 3) + 1;  
     502 
    499503    if (numImages < sizeZ[0] * sizeT[0]) { 
    500504      if (sizeT[0] == numImages) { 
    501         sizeT[0] /= sizeZ[0] * getEffectiveSizeC(id); 
    502         while (numImages > sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     505        sizeT[0] /= sizeZ[0] * effectiveC; 
     506        while (numImages > sizeZ[0] * sizeT[0] * effectiveC) { 
    503507          sizeT[0]++; 
    504508        } 
    505509      } 
    506510      else if (sizeZ[0] == numImages) { 
    507         sizeZ[0] /= sizeT[0] * getEffectiveSizeC(id); 
    508         while (numImages > sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     511        sizeZ[0] /= sizeT[0] * effectiveC; 
     512        while (numImages > sizeZ[0] * sizeT[0] * effectiveC) { 
    509513          sizeZ[0]++; 
    510514        } 
    511515      } 
    512516 
    513       if (numImages < sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     517      if (numImages < sizeZ[0] * sizeT[0] * effectiveC) { 
    514518        if (sizeZ[0] < sizeT[0]) { 
    515519          sizeZ[0]--; 
    516           while (numImages > sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     520          while (numImages > sizeZ[0] * sizeT[0] * effectiveC) { 
    517521            sizeT[0]++; 
    518522          } 
    519           while (numImages < sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     523          while (numImages < sizeZ[0] * sizeT[0] * effectiveC) { 
    520524            sizeT[0]--; 
    521525          } 
     
    523527        else { 
    524528          sizeT[0]--; 
    525           while (numImages > sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     529          while (numImages > sizeZ[0] * sizeT[0] * effectiveC) { 
    526530            sizeZ[0]++; 
    527531          } 
    528           if (numImages < sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     532          if (numImages < sizeZ[0] * sizeT[0] * effectiveC) { 
    529533            sizeZ[0]--; 
    530534          } 
    531535        } 
    532         while (numImages > sizeZ[0] * sizeT[0] * getEffectiveSizeC(id)) { 
     536        while (numImages > sizeZ[0] * sizeT[0] * effectiveC) { 
    533537          numImages--; 
    534538        } 
  • trunk/loci/formats/in/OpenlabReader.java

    r2320 r2323  
    645645      numImages = new int[1]; 
    646646      numImages[0] = oldImages; 
     647      if (layerInfoList[0].size() == 0) layerInfoList[0] = layerInfoList[1]; 
    647648    } 
    648649    else { 
Note: See TracChangeset for help on using the changeset viewer.