Changeset 6890


Ignore:
Timestamp:
09/06/10 13:00:32 (9 years ago)
Author:
melissa
Message:

A few fixes for ScanR datasets with missing wells, based on a patch submitted by Rubén Muñoz.

File:
1 edited

Legend:

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

    r6881 r6890  
    298298    wellColumns = uniqueColumns.size(); 
    299299 
    300     if (wellRows * wellColumns == 0) { 
    301       if (wellCount <= 96) { 
     300    if (wellRows * wellColumns != wellCount) { 
     301      if (wellCount <= 8) { 
     302        wellColumns = 2; 
     303        wellRows = 4; 
     304      } 
     305      else if (wellCount <= 96) { 
    302306        wellColumns = 12; 
     307        wellRows = 8; 
    303308      } 
    304309      else if (wellCount <= 384) { 
    305310        wellColumns = 24; 
    306       } 
    307       wellRows = wellCount / wellColumns; 
    308       if (wellRows * wellColumns < wellCount) wellRows++; 
     311        wellRows = 16; 
     312      } 
    309313    } 
    310314 
     
    365369        if (posIndex != next) realPosCount++; 
    366370      } 
    367       if (next == originalIndex) { 
     371      if (next == originalIndex && well < keys.length) { 
    368372        wellLabels.remove(keys[well]); 
    369373      } 
     
    521525          core[0].sizeT = Integer.parseInt(value); 
    522526        } 
     527        else if (key.equals("timeloop count")) { 
     528          core[0].sizeT = Integer.parseInt(value) + 1; 
     529        } 
    523530        else if (key.equals("name")) { 
    524531          channelNames.add(value); 
Note: See TracChangeset for help on using the changeset viewer.