Changeset 5535


Ignore:
Timestamp:
09/30/09 20:23:33 (10 years ago)
Author:
melissa
Message:
  • Removed most calls to MetadataStore.setDisplayOptions*
  • Make sure that FileStitcher populates MetadataStore when appropriate.
  • Fixed L2D metadata file parsing.
Location:
trunk/components/bio-formats/src/loci/formats
Files:
4 edited

Legend:

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

    r5517 r5535  
    10911091    store = reader.getMetadataStore(); 
    10921092    // don't overwrite pixel info if files aren't actually grouped 
    1093     if (!seriesInFile || files.length > 1) { 
     1093    if (!seriesInFile || files.length > 1 || files[0].length > 1) { 
    10941094      MetadataTools.populatePixels(store, this); 
    10951095    } 
  • trunk/components/bio-formats/src/loci/formats/MetadataTools.java

    r5533 r5535  
    377377      store.setPixelsBigEndian(new Boolean(!r.isLittleEndian()), i, 0); 
    378378      store.setPixelsDimensionOrder(r.getDimensionOrder(), i, 0); 
    379       store.setDisplayOptionsDisplay(r.isRGB() ? "RGB" : "Grey", i); 
    380379      if (r.getSizeC() > 0) { 
    381380        Integer sampleCount = new Integer(r.getRGBChannelCount()); 
  • trunk/components/bio-formats/src/loci/formats/in/BioRadReader.java

    r5528 r5535  
    593593                store.setObjectiveNominalMagnification( 
    594594                  new Integer((int) Double.parseDouble(values[11])), 0, 0); 
    595                 store.setDisplayOptionsZoom(new Float(values[12]), 0); 
    596595                store.setDimensionsPhysicalSizeZ(new Float(values[14]), 0, 0); 
    597596                break; 
  • trunk/components/bio-formats/src/loci/formats/in/L2DReader.java

    r5517 r5535  
    161161        } 
    162162      } 
    163       line = in.readLine().trim(); 
     163      if (in.getFilePointer() < in.length()) { 
     164        line = in.readLine().trim(); 
     165      } 
     166      else line = null; 
    164167    } 
    165168    in.close(); 
     
    223226          } 
    224227        } 
    225         line = scan.readLine().trim(); 
     228        if (scan.getFilePointer() < scan.length()) { 
     229          line = scan.readLine().trim(); 
     230        } 
     231        else line = null; 
    226232      } 
    227233      if (comments.size() == i) comments.add(null); 
Note: See TracChangeset for help on using the changeset viewer.