Changeset 6798

Timestamp:

08/16/10 12:37:24 (9 years ago)

Author:

melissa

Message:

Added 'Object getSeriesMetadataValue(String)' to IFormatReader.

Location:

trunk/components

Files:

• bio-formats/src/loci/formats/FileStitcher.java (modified) (1 diff)
• bio-formats/src/loci/formats/FormatReader.java (modified) (1 diff)
• bio-formats/src/loci/formats/IFormatReader.java (modified) (1 diff)
• bio-formats/src/loci/formats/ImageReader.java (modified) (1 diff)
• bio-formats/src/loci/formats/ReaderWrapper.java (modified) (1 diff)
• loci-plugins/src/loci/plugins/macro/LociFunctions.java (modified) (1 diff)

trunk/components/bio-formats/src/loci/formats/FileStitcher.java

@@ -825 +825 @@
   }
 
+  /* @see IFormatReader#getSeriesMetadataValue(String) */
+  public Object getSeriesMetadataValue(String field) {
+    FormatTools.assertId(currentId, true, 2);
+    return reader.getSeriesMetadataValue(field);
+  }
+
   /* @see IFormatReader#getGlobalMetadata() */
   public Hashtable<String, Object> getGlobalMetadata() {

trunk/components/bio-formats/src/loci/formats/FormatReader.java

@@ -952 +952 @@
   }
 
+  /* @see IFormatReader#getSeriesMetadataValue(String) */
+  public Object getSeriesMetadataValue(String field) {
+    FormatTools.assertId(currentId, true, 1);
+    return getSeriesMeta(field);
+  }
+
   /* @see IFormatReader#getGlobalMetadata() */
   public Hashtable<String, Object> getGlobalMetadata() {

trunk/components/bio-formats/src/loci/formats/IFormatReader.java

@@ -398 +398 @@
 
   /**
+   * Obtains the specified metadata field's value for the current series
+   * in the current file.
+   * @param field the name associated with the metadata field
+   * @return the value, or null if the field doesn't exist
+   */
+  Object getSeriesMetadataValue(String field);
+
+  /**
    * Obtains the hashtable containing the metadata field/value pairs from
    * the current file.

trunk/components/bio-formats/src/loci/formats/ImageReader.java

@@ -457 +457 @@
   }
 
+  /* @see IFormatReader#getSeriesMetadataValue(String) */
+  public Object getSeriesMetadataValue(String field) {
+    return getReader().getSeriesMetadataValue(field);
+  }
+
   /* @see IFormatReader#getGlobalMetadata() */
   public Hashtable<String, Object> getGlobalMetadata() {

trunk/components/bio-formats/src/loci/formats/ReaderWrapper.java

@@ -397 +397 @@
   public Object getMetadataValue(String field) {
     return reader.getMetadataValue(field);
+  }
+
+  public Object getSeriesMetadataValue(String field) {
+    return reader.getSeriesMetadataValue(field);
   }
 

trunk/components/loci-plugins/src/loci/plugins/macro/LociFunctions.java

@@ -282 +282 @@
   public void getMetadataValue(String field, String[] value) {
     Object o = r.getMetadataValue(field);
+    value[0] = o == null ? null : o.toString();
+  }
+
+  public void getSeriesMetadataValue(String field, String[] value) {
+    Object o = r.getSeriesMetadataValue(field);
     value[0] = o == null ? null : o.toString();
   }