Changeset 6798


Ignore:
Timestamp:
08/16/10 12:37:24 (9 years ago)
Author:
melissa
Message:

Added 'Object getSeriesMetadataValue(String)' to IFormatReader.

Location:
trunk/components
Files:
6 edited

Legend:

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

    r6301 r6798  
    825825  } 
    826826 
     827  /* @see IFormatReader#getSeriesMetadataValue(String) */ 
     828  public Object getSeriesMetadataValue(String field) { 
     829    FormatTools.assertId(currentId, true, 2); 
     830    return reader.getSeriesMetadataValue(field); 
     831  } 
     832 
    827833  /* @see IFormatReader#getGlobalMetadata() */ 
    828834  public Hashtable<String, Object> getGlobalMetadata() { 
  • trunk/components/bio-formats/src/loci/formats/FormatReader.java

    r6784 r6798  
    952952  } 
    953953 
     954  /* @see IFormatReader#getSeriesMetadataValue(String) */ 
     955  public Object getSeriesMetadataValue(String field) { 
     956    FormatTools.assertId(currentId, true, 1); 
     957    return getSeriesMeta(field); 
     958  } 
     959 
    954960  /* @see IFormatReader#getGlobalMetadata() */ 
    955961  public Hashtable<String, Object> getGlobalMetadata() { 
  • trunk/components/bio-formats/src/loci/formats/IFormatReader.java

    r6570 r6798  
    398398 
    399399  /** 
     400   * Obtains the specified metadata field's value for the current series 
     401   * in the current file. 
     402   * @param field the name associated with the metadata field 
     403   * @return the value, or null if the field doesn't exist 
     404   */ 
     405  Object getSeriesMetadataValue(String field); 
     406 
     407  /** 
    400408   * Obtains the hashtable containing the metadata field/value pairs from 
    401409   * the current file. 
  • trunk/components/bio-formats/src/loci/formats/ImageReader.java

    r6781 r6798  
    457457  } 
    458458 
     459  /* @see IFormatReader#getSeriesMetadataValue(String) */ 
     460  public Object getSeriesMetadataValue(String field) { 
     461    return getReader().getSeriesMetadataValue(field); 
     462  } 
     463 
    459464  /* @see IFormatReader#getGlobalMetadata() */ 
    460465  public Hashtable<String, Object> getGlobalMetadata() { 
  • trunk/components/bio-formats/src/loci/formats/ReaderWrapper.java

    r6445 r6798  
    397397  public Object getMetadataValue(String field) { 
    398398    return reader.getMetadataValue(field); 
     399  } 
     400 
     401  public Object getSeriesMetadataValue(String field) { 
     402    return reader.getSeriesMetadataValue(field); 
    399403  } 
    400404 
  • trunk/components/loci-plugins/src/loci/plugins/macro/LociFunctions.java

    r6654 r6798  
    282282  public void getMetadataValue(String field, String[] value) { 
    283283    Object o = r.getMetadataValue(field); 
     284    value[0] = o == null ? null : o.toString(); 
     285  } 
     286 
     287  public void getSeriesMetadataValue(String field, String[] value) { 
     288    Object o = r.getSeriesMetadataValue(field); 
    284289    value[0] = o == null ? null : o.toString(); 
    285290  } 
Note: See TracChangeset for help on using the changeset viewer.