Changeset 4695


Ignore:
Timestamp:
12/11/08 19:05:35 (11 years ago)
Author:
gbonamy
Message:

Fixed populating the metadata for DimensionsPhysicalSizeX, DimensionsPhysicalSizeY.

File:
1 edited

Legend:

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

    r4655 r4695  
    262262          store.setImageCreationDate(value, nextImage - 1); 
    263263        } 
    264         else if (currentQName.equals("ImageResolutionX")) { 
    265           store.setDimensionsPhysicalSizeX(new Float(value), nextImage - 1, 0); 
    266         } 
    267         else if (currentQName.equals("ImageResolutionY")) { 
    268           store.setDimensionsPhysicalSizeY(new Float(value), nextImage - 1, 0); 
    269         } 
    270264        else if (currentQName.equals("CameraBinningX")) { 
    271265          binX = Integer.parseInt(value); 
     
    274268          binY = Integer.parseInt(value); 
    275269        } 
     270      } 
     271      else if (parentQName.equals("ImageResolutionX")) { 
     272        store.setDimensionsPhysicalSizeX(new Float(value), nextImage - 1, 0); 
     273      } 
     274      else if (parentQName.equals("ImageResolutionY")) { 
     275        store.setDimensionsPhysicalSizeX(new Float(value), nextImage - 1, 0); 
    276276      } 
    277277      else if (parentQName.equals("Well")) { 
     
    438438 
    439439        nextImage++; 
    440  
     440         
     441        //Implemented for FLEX v1.7 and bellow 
    441442        String x = attributes.getValue("CameraBinningX"); 
    442443        String y = attributes.getValue("CameraBinningY"); 
     
    461462        addMeta("Status", attributes.getValue("StatusString")); 
    462463      } 
     464      else if(qName.equals("ImageResolutionX")) { 
     465        parentQName = qName; 
     466      //TODO: definition of the dimension type and unit Where to store? 
     467        for (int i=0; i<attributes.getLength(); i++) { 
     468          //addMeta("Image " + nextImage + " " + attributes.getQName(i), attributes.getValue(i)); 
     469        }         
     470      } 
     471      else if(qName.equals("ImageResolutionY")) { 
     472        parentQName = qName; 
     473        //TODO: definition of the dimension type and unit Where to store? 
     474        for (int i=0; i<attributes.getLength(); i++) { 
     475          //addMeta("Image " + nextImage + " " + attributes.getQName(i),attributes.getValue(i)); 
     476        }         
     477      } 
    463478    } 
    464479  } 
Note: See TracChangeset for help on using the changeset viewer.