From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 16 May 2006 13:06:01 +0000 (+0000)
Subject: graphColour, graphGroup, more relaxed annotation requirements
X-Git-Tag: Release_2_1~403
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=972070662bd0491add6dc4f949f5da4471d3b014;p=jalview.git

graphColour, graphGroup, more relaxed annotation requirements
---

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index ace83dd..a18648f 100755
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -9,9 +9,9 @@
 						<xs:element name="Annotation" minOccurs="0">
 							<xs:complexType>
 								<xs:sequence>
-									<xs:element ref="vamsas:annotationElement" maxOccurs="unbounded"/>
+									<xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>
 									<xs:element name="label" type="xs:string"/>
-									<xs:element name="description" type="xs:string"/>
+									<xs:element name="description" type="xs:string" minOccurs="0"/>
 									<xs:element name="thresholdLine" minOccurs="0">
 										<xs:complexType>
 											<xs:attribute name="label" type="xs:string"/>
@@ -23,6 +23,8 @@
 								<xs:attribute name="graph" type="xs:boolean" use="required"/>
 								<xs:attribute name="graphType" type="xs:int" use="optional"/>
 								<xs:attribute name="sequenceRef" type="xs:string" use="optional"/>
+								<xs:attribute name="graphColour" type="xs:int" use="optional"/>
+								<xs:attribute name="graphGroup" type="xs:int" use="optional"/>
 							</xs:complexType>
 						</xs:element>
 						<xs:element ref="vamsas:SequenceSet"/>
@@ -58,18 +60,19 @@
 	<xs:element name="annotationElement">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="displayCharacter" type="xs:string"/>
-				<xs:element name="description" type="xs:string"/>
-				<xs:element name="secondaryStructure">
+				<xs:element name="displayCharacter" type="xs:string" minOccurs="0"/>
+				<xs:element name="description" type="xs:string" minOccurs="0"/>
+				<xs:element name="secondaryStructure" minOccurs="0">
 					<xs:simpleType>
 						<xs:restriction base="xs:string">
 							<xs:length value="1"/>
 						</xs:restriction>
 					</xs:simpleType>
 				</xs:element>
-				<xs:element name="value" type="xs:float"/>
+				<xs:element name="value" type="xs:float" minOccurs="0"/>
 			</xs:sequence>
 			<xs:attribute name="position" type="xs:int" use="required"/>
+			<xs:attribute name="colour" type="xs:int" use="optional"/>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="SequenceType">