Changeset 6352


Ignore:
Timestamp:
05/20/10 13:49:20 (9 years ago)
Author:
melissa
Message:

Fixed Well -> WellSample linkage. See  omero:2406.

Files:
2 edited

Legend:

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

    r6315 r6352  
    444444    for (int row=0; row<wellRows; row++) { 
    445445      for (int col=0; col<wellColumns; col++) { 
     446        int well = row * wellColumns + col; 
     447        store.setWellRow(new NonNegativeInteger(row), 0, well); 
     448        store.setWellColumn(new NonNegativeInteger(col), 0, well); 
    446449      } 
    447450    } 
     
    457460      store.setImageName("Well " + wellRow + "-" + (wellNumber[pos[1]][1] + 1) + 
    458461        "; Field #" + (pos[0] + 1), i); 
     462 
     463      if (wellRows == 0 && wellColumns == 0) { 
     464        well = pos[1]; 
     465        store.setWellRow( 
     466          new NonNegativeInteger(wellNumber[pos[1]][0]), pos[2], pos[1]); 
     467        store.setWellColumn( 
     468          new NonNegativeInteger(wellNumber[pos[1]][1]), pos[2], pos[1]); 
     469      } 
    459470      store.setWellSampleIndex(new NonNegativeInteger(i), pos[2], well, pos[0]); 
    460471      store.setWellSampleImageRef(imageID, pos[2], well, pos[0]); 
    461       store.setWellRow(new NonNegativeInteger(wellNumber[pos[1]][0]), 0, i); 
    462       store.setWellColumn(new NonNegativeInteger(wellNumber[pos[1]][1]), 0, i); 
    463472    } 
    464473 
  • trunk/components/bio-formats/src/loci/formats/in/FlexReader.java

    r6315 r6352  
    444444    for (int row=0; row<wellRows; row++) { 
    445445      for (int col=0; col<wellColumns; col++) { 
     446        int well = row * wellColumns + col; 
     447        store.setWellRow(new NonNegativeInteger(row), 0, well); 
     448        store.setWellColumn(new NonNegativeInteger(col), 0, well); 
    446449      } 
    447450    } 
     
    457460      store.setImageName("Well " + wellRow + "-" + (wellNumber[pos[1]][1] + 1) + 
    458461        "; Field #" + (pos[0] + 1), i); 
     462 
     463      if (wellRows == 0 && wellColumns == 0) { 
     464        well = pos[1]; 
     465        store.setWellRow( 
     466          new NonNegativeInteger(wellNumber[well][0]), pos[2], well); 
     467        store.setWellColumn( 
     468          new NonNegativeInteger(wellNumber[well][1]), pos[2], well); 
     469      } 
    459470      store.setWellSampleIndex(new NonNegativeInteger(i), pos[2], well, pos[0]); 
    460471      store.setWellSampleImageRef(imageID, pos[2], well, pos[0]); 
    461       store.setWellRow(new NonNegativeInteger(wellNumber[pos[1]][0]), 0, i); 
    462       store.setWellColumn(new NonNegativeInteger(wellNumber[pos[1]][1]), 0, i); 
    463472    } 
    464473 
Note: See TracChangeset for help on using the changeset viewer.