Save graph threshold and annotation colours

[jalview.git] / schemas / jalview.xsd

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 2bedcd6..cc7ffdc 100755 (executable)
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
-                                xmlns:vamsas="www.vamsas.ac.uk/jalview/version2"\r
-                                xmlns:jalview="www.jalview.org/colours"\r
-                                xmlns:jv="www.jalview.org" \r
-                                targetNamespace="www.jalview.org" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
-                                \r
-       <xs:import schemaLocation="vamsas.xsd" namespace="www.vamsas.ac.uk/jalview/version2"/>\r
-       <xs:import schemaLocation="JalviewUserColours.xsd" namespace="www.jalview.org/colours"/>\r
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:vamsas="www.vamsas.ac.uk/jalview/version2" xmlns:jalview="www.jalview.org/colours" xmlns:jv="www.jalview.org" targetNamespace="www.jalview.org" elementFormDefault="qualified" attributeFormDefault="unqualified">\r
+       <xs:import namespace="www.vamsas.ac.uk/jalview/version2" schemaLocation="vamsas.xsd"/>\r
+       <xs:import namespace="www.jalview.org/colours" schemaLocation="JalviewUserColours.xsd"/>\r
        <xs:complexType name="JalviewModel">\r
                <xs:sequence>\r
                        <xs:element name="creationDate" type="xs:dateTime"/>\r
@@ -16,20 +11,19 @@
                                <xs:element name="JSeq" maxOccurs="unbounded">\r
                                        <xs:complexType>\r
                                                <xs:sequence>\r
-                                                        <xs:element name="features" type="jv:feature" minOccurs="0" maxOccurs="unbounded"/>\r
-                                                        <xs:element name="pdbids" type="jv:pdbentry" minOccurs="0" maxOccurs="unbounded"/>\r
-                                             </xs:sequence>\r
-                                             \r
-                                                   <xs:attribute name="colour" type="xs:int" use="optional"/>\r
-                                                       <xs:attribute name="start" type="xs:int" use="required"/>\r
-                                                       <xs:attribute name="end" type="xs:int" use="required"/>\r
-                                                       <xs:attribute name="id" type="xs:int" use="required"/>\r
-                                               </xs:complexType>\r
+                                                       <xs:element name="features" type="jv:feature" minOccurs="0" maxOccurs="unbounded"/>\r
+                                                       <xs:element name="pdbids" type="jv:pdbentry" minOccurs="0" maxOccurs="unbounded"/>\r
+                                               </xs:sequence>\r
+                                               <xs:attribute name="colour" type="xs:int" use="optional"/>\r
+                                               <xs:attribute name="start" type="xs:int" use="required"/>\r
+                                               <xs:attribute name="end" type="xs:int" use="required"/>\r
+                                               <xs:attribute name="id" type="xs:int" use="required"/>\r
+                                       </xs:complexType>\r
                                </xs:element>\r
                                <xs:element name="JGroup" minOccurs="0" maxOccurs="unbounded">\r
                                        <xs:complexType>\r
-                                               <xs:sequence minOccurs="1">\r
-                                                       <xs:element name="seq" maxOccurs="unbounded" type="xs:int"/>\r
+                                               <xs:sequence>\r
+                                                       <xs:element name="seq" type="xs:int" maxOccurs="unbounded"/>\r
                                                </xs:sequence>\r
                                                <xs:attribute name="start" type="xs:int"/>\r
                                                <xs:attribute name="end" type="xs:int"/>\r
@@ -45,6 +39,18 @@
                                </xs:element>\r
                                <xs:element name="Viewport" maxOccurs="unbounded">\r
                                        <xs:complexType>\r
+                                               <xs:sequence>\r
+                                                       <xs:element name="AnnotationColours" minOccurs="0">\r
+                                                               <xs:complexType>\r
+                                                                       <xs:attribute name="aboveThreshold" type="xs:int"/>\r
+                                                                       <xs:attribute name="annotation" type="xs:string"/>\r
+                                                                       <xs:attribute name="minColour" type="xs:int"/>\r
+                                                                       <xs:attribute name="maxColour" type="xs:int"/>\r
+                                                                       <xs:attribute name="colourScheme" type="xs:string"/>\r
+                                                                       <xs:attribute name="threshold" type="xs:float"/>\r
+                                                               </xs:complexType>\r
+                                                       </xs:element>\r
+                                               </xs:sequence>\r
                                                <xs:attribute name="conservationSelected" type="xs:boolean"/>\r
                                                <xs:attribute name="pidSelected" type="xs:boolean"/>\r
                                                <xs:attribute name="bgColour" type="xs:string"/>\r
@@ -75,7 +81,7 @@
                                </xs:element>\r
                                <xs:element name="UserColours" minOccurs="0" maxOccurs="unbounded">\r
                                        <xs:complexType>\r
-                                               <xs:sequence minOccurs="1">\r
+                                               <xs:sequence>\r
                                                        <xs:element name="UserColourScheme" type="jalview:JalviewUserColours"/>\r
                                                </xs:sequence>\r
                                                <xs:attribute name="id" type="xs:string"/>\r
@@ -83,7 +89,7 @@
                                </xs:element>\r
                                <xs:element name="tree" minOccurs="0" maxOccurs="unbounded">\r
                                        <xs:complexType>\r
-                                               <xs:sequence minOccurs="0" maxOccurs="1">\r
+                                               <xs:sequence minOccurs="0">\r
                                                        <xs:element name="title" type="xs:string"/>\r
                                                        <xs:element name="newick" type="xs:string"/>\r
                                                </xs:sequence>\r
@@ -102,25 +108,22 @@
                                                <xs:attribute name="currentTree" type="xs:boolean"/>\r
                                        </xs:complexType>\r
                                </xs:element>\r
-                               \r
-                               <xs:element name="FeatureSettings" minOccurs="0" maxOccurs="1">\r
-                                               <xs:complexType>\r
-                               <xs:sequence>\r
-                                       <xs:element name="setting" minOccurs="0" maxOccurs="unbounded">\r
-                                               <xs:complexType>\r
-                                                       <xs:attribute name="type" type="xs:string" use="required"/>\r
-                                                       <xs:attribute name="colour" type="xs:int" use="required"/>\r
-                                                       <xs:attribute name="display" type="xs:boolean" use="required"/>\r
-                                               </xs:complexType>\r
-                                       </xs:element>\r
-                               </xs:sequence>\r
-                               </xs:complexType>\r
+                               <xs:element name="FeatureSettings" minOccurs="0">\r
+                                       <xs:complexType>\r
+                                               <xs:sequence>\r
+                                                       <xs:element name="setting" minOccurs="0" maxOccurs="unbounded">\r
+                                                               <xs:complexType>\r
+                                                                       <xs:attribute name="type" type="xs:string" use="required"/>\r
+                                                                       <xs:attribute name="colour" type="xs:int" use="required"/>\r
+                                                                       <xs:attribute name="display" type="xs:boolean" use="required"/>\r
+                                                               </xs:complexType>\r
+                                                       </xs:element>\r
+                                               </xs:sequence>\r
+                                       </xs:complexType>\r
                                </xs:element>\r
-                               \r
                        </xs:sequence>\r
                </xs:sequence>\r
        </xs:complexType>\r
-       \r
        <xs:complexType name="feature">\r
                <xs:attribute name="begin" type="xs:int" use="required"/>\r
                <xs:attribute name="end" type="xs:int" use="required"/>\r
@@ -129,7 +132,6 @@
                <xs:attribute name="status" type="xs:string" use="optional"/>\r
                <xs:attribute name="featureGroup" type="xs:string" use="optional"/>\r
        </xs:complexType>\r
-               \r
        <xs:complexType name="pdbentry">\r
                <xs:sequence minOccurs="0" maxOccurs="unbounded">\r
                        <xs:element name="property" minOccurs="0" maxOccurs="unbounded">\r
@@ -142,5 +144,4 @@
                <xs:attribute name="id" type="xs:string" use="required"/>\r
                <xs:attribute name="type" type="xs:string" use="optional"/>\r
        </xs:complexType>\r
-       \r
 </xs:schema>\r