Add API and implementations to provide axis orientation

components/bio-formats-plugins/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>ome</groupId>
     <artifactId>pom-bio-formats</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

components/bio-formats-tools/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>ome</groupId>
     <artifactId>pom-bio-formats</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

components/bundles/bioformats_package/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>ome</groupId>
     <artifactId>pom-bio-formats</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 

components/forks/turbojpeg/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>ome</groupId>
     <artifactId>pom-bio-formats</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <relativePath>../../../</relativePath>
   </parent>
 

components/formats-api/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>ome</groupId>
     <artifactId>pom-bio-formats</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

components/formats-api/src/loci/formats/AnatomicalOrientation.java

@@ -0,0 +1,75 @@
+/*
+ * #%L
+ * Top-level reader and writer APIs
+ * %%
+ * Copyright (C) 2023 Open Microscopy Environment:
+ *   - Board of Regents of the University of Wisconsin-Madison
+ *   - Glencoe Software, Inc.
+ *   - University of Dundee
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package loci.formats;
+
+/**
+ * Enum of anatomical orientation terms defined in:
+ * https://ngff.openmicroscopy.org/rfc/4/#permissible-values
+ */
+public enum AnatomicalOrientation implements OrientationTerm {
+  LEFT_TO_RIGHT("left-to-right"),
+  RIGHT_TO_LEFT("right-to-left"),
+  ANTERIOR_TO_POSTERIOR("anterior-to-posterior"),
+  POSTERIOR_TO_ANTERIOR("posterior-to-anterior"),
+  INFERIOR_TO_SUPERIOR("inferior-to-superior"),
+  SUPERIOR_TO_INFERIOR("superior-to-inferior"),
+  DORSAL_TO_VENTRAL("dorsal-to-ventral"),
+  VENTRAL_TO_DORSAL("ventral-to-dorsal"),
+  DORSAL_TO_PALMAR("dorsal-to-palmar"),
+  PALMAR_TO_DORSAL("palmar-to-dorsal"),
+  DORSAL_TO_PLANTAR("dorsal-to-plantar"),
+  PLANTAR_TO_DORSAL("plantar-to-dorsal"),
+  ROSTRAL_TO_CAUDAL("rostral-to-caudal"),
+  CAUDAL_TO_ROSTRAL("caudal-to-rostral"),
+  CRANIAL_TO_CAUDAL("cranial-to-caudal"),
+  CAUDAL_TO_CRANIAL("caudal-to-cranial"),
+  PROXIMAL_TO_DISTAL("proximal-to-distal"),
+  DISTAL_TO_PROXIMAL("distal-to-proximal"),
+  SUPERFICIAL_TO_DEEP("superficial-to-deep"),
+  DEEP_TO_SUPERFICIAL("deep-to-superficial"),
+  APICAL_TO_BASAL("apical-to-basal"),
+  BASAL_TO_APICAL("basal-to-apical"),
+  APEX_TO_BASE("apex-to-base"),
+  BASE_TO_APEX("base-to-apex");
+
+  private String definedTerm;
+
+  private AnatomicalOrientation(String term) {
+    definedTerm = term;
+  }
+
+  @Override
+  public String getDefinedTerm() {
+    return definedTerm;
+  }
+}

components/formats-api/src/loci/formats/IAxisOrientationReader.java

@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * Top-level reader and writer APIs
+ * %%
+ * Copyright (C) 2023 Open Microscopy Environment:
+ *   - Board of Regents of the University of Wisconsin-Madison
+ *   - Glencoe Software, Inc.
+ *   - University of Dundee
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package loci.formats;
+
+/**
+ * Interface for reading axis orientation metadata.
+ */
+public interface IAxisOrientationReader {
+
+  /**
+   * Get one orientation object per axis (e.g. "X", "Y"), for the current series.
+   * Order matches getDimensionOrder(). Array elements may be null.
+   */
+  default Orientation[] getAxisOrientations() {
+    return new Orientation[5];
+  }
+}

components/formats-api/src/loci/formats/Orientation.java

@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Top-level reader and writer APIs
+ * %%
+ * Copyright (C) 2023 Open Microscopy Environment:
+ *   - Board of Regents of the University of Wisconsin-Madison
+ *   - Glencoe Software, Inc.
+ *   - University of Dundee
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package loci.formats;
+
+/**
+ * Defines an orientation that can be associated with an axis.
+ */
+public class Orientation {
+
+  private OrientationType type;
+
+  private OrientationTerm value;
+
+  public Orientation(OrientationType type, OrientationTerm term) {
+    this.type = type;
+    this.value = term;
+  }
+
+  public void setOrientationType(OrientationType type) {
+    this.type = type;
+  }
+
+  public OrientationType getOrientationType() {
+    return type;
+  }
+
+  public void setOrientationTerm(OrientationTerm term) {
+    value = term;
+  }
+
+  public OrientationTerm getOrientationTerm() {
+    return value;
+  }
+
+}

components/formats-api/src/loci/formats/OrientationTerm.java

@@ -0,0 +1,42 @@
+/*
+ * #%L
+ * Top-level reader and writer APIs
+ * %%
+ * Copyright (C) 2023 Open Microscopy Environment:
+ *   - Board of Regents of the University of Wisconsin-Madison
+ *   - Glencoe Software, Inc.
+ *   - University of Dundee
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package loci.formats;
+
+/**
+ * Common interface for orientation values.
+ */
+public interface OrientationTerm {
+
+  /** @return the defined vocabulary term for the orientation */
+  String getDefinedTerm();
+}

components/formats-api/src/loci/formats/OrientationType.java

@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Top-level reader and writer APIs
+ * %%
+ * Copyright (C) 2023 Open Microscopy Environment:
+ *   - Board of Regents of the University of Wisconsin-Madison
+ *   - Glencoe Software, Inc.
+ *   - University of Dundee
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package loci.formats;
+
+/**
+ * Enum of recognized axis orientation types.
+ */
+public enum OrientationType {
+  ANATOMICAL("anatomical", AnatomicalOrientation.class);
+
+  private String definedType;
+  private Class<? extends OrientationTerm> terms;
+
+  private OrientationType(String type, Class<? extends OrientationTerm> terms) {
+    definedType = type;
+    this.terms = terms;
+  }
+
+  public String getDefinedType() {
+    return definedType;
+  }
+
+  public Class<? extends OrientationTerm> getOrientationTermClass() {
+    return terms;
+  }
+
+  public static OrientationType fromString(String type) {
+    for (OrientationType t : OrientationType.class.getEnumConstants()) {
+      if (t.getDefinedType().equals(type)) {
+        return t;
+      }
+    }
+    return null;
+  }
+}

components/formats-bsd/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>ome</groupId>
     <artifactId>pom-bio-formats</artifactId>
-    <version>8.6.0-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

components/formats-bsd/src/loci/formats/dicom/DicomAttribute.java

@@ -225,6 +225,7 @@ public enum DicomAttribute {
     PREGNANCY_STATUS(0x001021c0),
     LAST_MENSTRUAL_DATE(0x001021d0),
     PATIENT_RELIGIOUS_PREFERENCE(0x001021f0),
+    ANATOMICAL_ORIENTATION_TYPE(0x00102210),
     PATIENT_COMMENTS(0x00104000),
     CLINICAL_TRIAL_SPONSOR_NAME(0x00120010),
     CLINICAL_TRIAL_PROTOCOL_ID(0x00120020),