Browse Source

BUG: Add pointfile element

Add the pointfile element that has been added to the Slicer
execution module[1] by extending the fileType. Also separated
out the coordinateSystem attribute so that it can be used in both the point
and pointFile types.

[1] https://github.com/Slicer/SlicerExecutionModel/commit/608c7b06f9402b35f0ec01550a3b9e313582f683

Issue #622
Nicole Aucoin 9 years ago
parent
commit
ee5af6afcb
1 changed files with 44 additions and 20 deletions
  1. 44 20
      Libs/CommandLineModules/Core/Resources/ctkCmdLineModule.xsd

+ 44 - 20
Libs/CommandLineModules/Core/Resources/ctkCmdLineModule.xsd

@@ -153,6 +153,8 @@
         <xsd:element name="point" type="pointType"/>
         <xsd:element name="region" type="pointType"/>
         
+        <xsd:element name="pointfile" type="pointFileType"/>
+
         <xsd:element name="file" type="fileType"/>
         <xsd:element name="image" type="imageType"/>
         <xsd:element name="geometry" type="geometryType"/>
@@ -353,6 +355,32 @@
 
   <!--
   ===================================================================
+    Definition of 'coordinateSystem'.
+  ===================================================================
+  -->
+  <xsd:attribute name="coordinateSystem">
+    <xsd:annotation>
+      <xsd:documentation>Specifies the coordinate system. If unspecified, the executing module is free to interpret the
+      coordinates in the most appropriate way. For more information about the different systems, see
+      &lt;a href="http://www.slicer.org/slicerWiki/index.php/Coordinate_systems"&gt;Coordinate Systems&lt;/a&gt;.
+      &lt;ul&gt;
+      &lt;li&gt;&lt;b&gt;ras&lt;/b&gt; (Right, Anterior, Superior) coordinate system.&lt;/li&gt;
+      &lt;li&gt;&lt;b&gt;ijk&lt;/b&gt; image coordinate system.&lt;/li&gt;
+      &lt;li&gt;&lt;b&gt;lps&lt;/b&gt; (Left, Posterior, Superior) coordinate system.&lt;/li&gt;
+      &lt;/ul&gt;
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleType>
+      <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="ras"/>
+        <xsd:enumeration value="ijk"/>
+        <xsd:enumeration value="lps"/>
+      </xsd:restriction>
+    </xsd:simpleType>
+  </xsd:attribute>
+
+  <!--
+  ===================================================================
     POINT PARAMETER 
       Extends multipleType for parameters with point-like values (point and region).
   ===================================================================
@@ -363,26 +391,7 @@
     </xsd:annotation>
     <xsd:complexContent>
       <xsd:extension base="multipleType">
-        <xsd:attribute name="coordinateSystem">
-          <xsd:annotation>
-            <xsd:documentation>Specifies the coordinate system. If unspecified, the executing module is free to interpret the
-            coordinates in the most appropriate way. For more information about the different systems, see
-            &lt;a href="http://www.slicer.org/slicerWiki/index.php/Coordinate_systems"&gt;Coordinate Systems&lt;/a&gt;.
-            &lt;ul&gt;
-            &lt;li&gt;&lt;b&gt;ras&lt;/b&gt; (Right, Anterior, Superior) coordinate system.&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;ijk&lt;/b&gt; image coordinate system.&lt;/li&gt;
-            &lt;li&gt;&lt;b&gt;lps&lt;/b&gt; (Left, Posterior, Superior) coordinate system.&lt;/li&gt;
-            &lt;/ul&gt;
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:simpleType>
-            <xsd:restriction base="xsd:string">
-              <xsd:enumeration value="ras"/>
-              <xsd:enumeration value="ijk"/>
-              <xsd:enumeration value="lps"/>
-            </xsd:restriction>
-          </xsd:simpleType>
-        </xsd:attribute>
+        <xsd:attribute ref="coordinateSystem"/>
       </xsd:extension>
     </xsd:complexContent>
   </xsd:complexType>
@@ -451,6 +460,21 @@
 
   <!--
   ===================================================================
+    POINTFILE PARAMETER
+      Extends fileType for parameters with coordinate system
+      information.
+  ===================================================================
+  -->
+  <xsd:complexType name="pointFileType">
+    <xsd:complexContent>
+      <xsd:extension base="fileType">
+      <xsd:attribute ref="coordinateSystem"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+
+  <!--
+  ===================================================================
     IMAGE PARAMETER 
       Extends fileType for image parameters (image).
   ===================================================================