Merge pull request #2553 from mtbc/add-enums

add enumeration values for acquisition mode
ome · Sep 21, 2016 · 7552d60 · 7552d60
2 parents 2a6f77f + b7af4fe
commit 7552d60
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/components/specification/released-schema/2016-06/ome.xsd b/components/specification/released-schema/2016-06/ome.xsd
@@ -24,7 +24,7 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:OME="http://www.openmicroscopy.org/Schemas/OME/2016-06"
             xmlns:xml="http://www.w3.org/XML/1998/namespace"
-            version="1"
+            version="2"
             elementFormDefault="qualified">
 
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
@@ -689,6 +689,9 @@
             <xsd:enumeration value="FSM"/><!-- Fluorescence speckle microscopy -->
             <xsd:enumeration value="LCM"/><!-- Laser capture microdissection -->
             <xsd:enumeration value="Other"/>
+            <xsd:enumeration value="BrightField"/>
+            <xsd:enumeration value="SweptFieldConfocal"/>
+            <xsd:enumeration value="SPIM"/><!-- Selective or Single Plane Illumination Microscopy -->
           </xsd:restriction>
         </xsd:simpleType>
       </xsd:attribute>

diff --git a/components/specification/transforms/2016-06-to-2015-01.xsl b/components/specification/transforms/2016-06-to-2015-01.xsl
@@ -128,6 +128,15 @@
   <xsl:template match="OME:Folder"/>
   <xsl:template match="OME:FolderRef"/>
 
+  <!-- Remove new enumeration values -->
+  <xsl:template match="OME:Channel/@AcquisitionMode[. = 'BrightField' or
+                                                    . = 'SweptFieldConfocal' or
+                                                    . = 'SPIM']">
+    <xsl:attribute name="AcquisitionMode">
+      <xsl:text>Other</xsl:text>
+    </xsl:attribute>
+  </xsl:template>
+
   <!-- Default processing -->
 
   <xsl:template match="@*|node()">

diff --git a/components/xsd-fu/cfg/enum_handler.cfg b/components/xsd-fu/cfg/enum_handler.cfg
@@ -1,5 +1,7 @@
 [AcquisitionMode]
 ".*Widefield.*" = "WideField"
+"^Laser Scan Confocal$" = "LaserScanningConfocalMicroscopy"
+"^Swept Field Confocal$" = "SweptFieldConfocal"
 
 [Correction]
 ".*Pl.*Apo.*" = "PlanApo"