Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add enumeration values for acquisition mode #2553

Merged
merged 5 commits into from
Sep 21, 2016
Merged

add enumeration values for acquisition mode #2553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13f5c20
bump OME-XML schema version number to 2
mtbc Sep 1, 2016
e20a4e7
add values to AcquisitionMode enumeration in schema
mtbc Sep 1, 2016
a69ef1a
adjust enumeration handler for more acquisition modes
mtbc Sep 1, 2016
32e6f72
reorder enumeration values so new follow previous
mtbc Sep 8, 2016
b7af4fe
remove new enumeration values in schema downgrade
mtbc Sep 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion components/specification/released-schema/2016-06/ome.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down
9 changes: 9 additions & 0 deletions components/specification/transforms/2016-06-to-2015-01.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()">
Expand Down
2 changes: 2 additions & 0 deletions components/xsd-fu/cfg/enum_handler.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[AcquisitionMode]
".*Widefield.*" = "WideField"
"^Laser Scan Confocal$" = "LaserScanningConfocalMicroscopy"
"^Swept Field Confocal$" = "SweptFieldConfocal"

[Correction]
".*Pl.*Apo.*" = "PlanApo"
Expand Down