[Cardiacatlas-svn-updates] SF.net SVN: cardiacatlas:[61] trunk/CAPXMLModel/CardiacAnnotation.xsd

[<sol...@us...>]

Revision: 61
          http://cardiacatlas.svn.sourceforge.net/cardiacatlas/?rev=61&view=rev
Author:   solidether
Date:     2010-08-02 00:05:21 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
added scope (study/series/instance) as attribute for label

Modified Paths:
--------------
    trunk/CAPXMLModel/CardiacAnnotation.xsd

Modified: trunk/CAPXMLModel/CardiacAnnotation.xsd
===================================================================
--- trunk/CAPXMLModel/CardiacAnnotation.xsd	2010-08-01 23:56:46 UTC (rev 60)
+++ trunk/CAPXMLModel/CardiacAnnotation.xsd	2010-08-02 00:05:21 UTC (rev 61)
@@ -1,35 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.cardiacatlas.org" elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.cardiacatlas.org">
+<xsd:schema targetNamespace="http://www.cardiacatlas.org" elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cap="http://www.cardiacatlas.org">
 
-    <xsd:element name="CardiacAnnotation" type="CardiacAnnotation" />
+    <xsd:element name="CardiacAnnotation" type="cap:CardiacAnnotation" />
     	
     <xsd:complexType name="CardiacAnnotation">
     	<xsd:sequence>
-    		<xsd:element name="ROI" type="ROI" minOccurs="1" maxOccurs="unbounded"/>
+    		<xsd:element name="ROI" type="cap:ROI" minOccurs="1" maxOccurs="unbounded" />
     	</xsd:sequence>
     	<xsd:attribute name="sopiuid" type="xsd:string" use="required" />
     </xsd:complexType>
 
     <xsd:complexType name="ROI">
 		<xsd:sequence>
-			<xsd:element name="Label" type="Label" minOccurs="1" maxOccurs="1" />
-			<xsd:element name="Point" type="Point" minOccurs="1" maxOccurs="unbounded"/>
+			<xsd:element name="Label" type="cap:Label" minOccurs="1" maxOccurs="1" />
+			<xsd:element name="Point" type="cap:Point" minOccurs="1" maxOccurs="unbounded" />
 		</xsd:sequence>
     </xsd:complexType>
 
     <xsd:complexType name="Label">
     	<xsd:simpleContent>
     		<xsd:extension base="xsd:string">
-    			<xsd:attribute name="rid" type="xsd:string" use="required"/>
+    			<xsd:attribute name="rid" type="xsd:string" use="required" />
+    			<xsd:attribute name="scope" type="cap:Scope" use="required" />
     		</xsd:extension>
     	</xsd:simpleContent>
     </xsd:complexType>
     
     <xsd:complexType name="Point">
     	<xsd:sequence>
-    		<xsd:element name="x" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-    		<xsd:element name="y" type="xsd:int" minOccurs="1" maxOccurs="1"/>
+    		<xsd:element name="x" type="xsd:int" minOccurs="1" maxOccurs="1" />
+    		<xsd:element name="y" type="xsd:int" minOccurs="1" maxOccurs="1" />
     	</xsd:sequence>
-    	<xsd:attribute name="number" type="xsd:int"/>
+    	<xsd:attribute name="number" type="xsd:int" />
     </xsd:complexType>
+
+    <xsd:simpleType name="Scope">
+    	<xsd:restriction base="xsd:string">
+    		<xsd:enumeration value="Study"/>
+    		<xsd:enumeration value="Series"/>
+    		<xsd:enumeration value="Instance"/>
+    	</xsd:restriction>
+    </xsd:simpleType>
 </xsd:schema>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.