Changeset 6074


Ignore:
Timestamp:
03/29/10 11:01:42 (10 years ago)
Author:
callan
Message:

PIXELS_ONLY --> MINIMUM metadata level.

Location:
trunk/components/bio-formats
Files:
6 edited

Legend:

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

    r6071 r6074  
    415415    Set<MetadataLevel> supportedLevels = new HashSet<MetadataLevel>(); 
    416416    supportedLevels.add(MetadataLevel.ALL); 
    417     supportedLevels.add(MetadataLevel.PIXELS_ONLY); 
     417    supportedLevels.add(MetadataLevel.MINIMUM); 
    418418    return supportedLevels; 
    419419  } 
  • trunk/components/bio-formats/src/loci/formats/in/DeltavisionReader.java

    r6071 r6074  
    182182    MetadataLevel metadataLevel = metadataOptions.getMetadataLevel(); 
    183183    switch (metadataLevel) { 
    184       case PIXELS_ONLY: { 
     184      case MINIMUM: { 
    185185        initFilePixelsOnly(id); 
    186186        break; 
  • trunk/components/bio-formats/src/loci/formats/in/LeicaReader.java

    r6072 r6074  
    533533    MetadataTools.populatePixels(store, this, true); 
    534534 
    535     if (metadataLevel == MetadataLevel.PIXELS_ONLY) return; 
     535    if (metadataLevel == MetadataLevel.MINIMUM) return; 
    536536 
    537537    for (int i=0; i<numSeries; i++) { 
  • trunk/components/bio-formats/src/loci/formats/in/MetadataLevel.java

    r6069 r6074  
    3434public enum MetadataLevel { 
    3535 
    36   PIXELS_ONLY, 
     36  MINIMUM, 
    3737  ALL; 
    3838 
  • trunk/components/bio-formats/test/loci/formats/utests/DeltavisionMetadataConfigurableTest.java

    r6072 r6074  
    6060  public void setUp() { 
    6161    pixelsOnly = new DeltavisionReader(); 
    62     pixelsOnly.getMetadataOptions().setMetadataLevel(MetadataLevel.PIXELS_ONLY); 
     62    pixelsOnly.getMetadataOptions().setMetadataLevel(MetadataLevel.MINIMUM); 
    6363    all = new DeltavisionReader(); 
    6464    all.getMetadataOptions().setMetadataLevel(MetadataLevel.ALL); 
     
    6969    long t0 = System.currentTimeMillis(); 
    7070    pixelsOnly.setId(ID); 
    71     assertEquals(MetadataLevel.PIXELS_ONLY, 
     71    assertEquals(MetadataLevel.MINIMUM, 
    7272                 pixelsOnly.getMetadataOptions().getMetadataLevel()); 
    7373    assertNull(pixelsOnly.getSeriesMetadata().get(ALL_ONLY_KEY)); 
  • trunk/components/bio-formats/test/loci/formats/utests/MetadataConfigurableTest.java

    r6072 r6074  
    5757    pixelsOnly = new ImageReader(); 
    5858    pixelsOnly.setMetadataOptions( 
    59       new DefaultMetadataOptions(MetadataLevel.PIXELS_ONLY)); 
     59      new DefaultMetadataOptions(MetadataLevel.MINIMUM)); 
    6060    all = new ImageReader(); 
    6161    all.setMetadataOptions(new DefaultMetadataOptions(MetadataLevel.ALL)); 
     
    6767    long t0 = System.currentTimeMillis(); 
    6868    pixelsOnly.setId(id); 
    69     assertEquals(MetadataLevel.PIXELS_ONLY, 
     69    assertEquals(MetadataLevel.MINIMUM, 
    7070      pixelsOnly.getMetadataOptions().getMetadataLevel()); 
    7171 
Note: See TracChangeset for help on using the changeset viewer.