extend XML model for graduated feature colours, group associated manual/auto annotati...

[jalview.git] / schemas / vamsas.xsd

diff --git a/schemas/vamsas.xsd b/schemas/vamsas.xsd
index e32427d..f438063 100755 (executable)
--- a/schemas/vamsas.xsd
+++ b/schemas/vamsas.xsd
@@ -174,26 +174,46 @@
        <xs:element name="Annotation">
                <xs:complexType>
                        <xs:sequence>
-                               <xs:element ref="vamsas:annotationElement" minOccurs="0" maxOccurs="unbounded"/>
-                               <xs:element name="label" type="xs:string"/>
-                               <xs:element name="description" type="xs:string" minOccurs="0"/>
+                               <xs:element ref="vamsas:annotationElement" minOccurs="0"
+                                       maxOccurs="unbounded" />
+                               <xs:element name="label" 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"/>
-                                               <xs:attribute name="value" type="xs:float"/>
-                                               <xs:attribute name="colour" type="xs:int"/>
+                                               <xs:attribute name="label" type="xs:string" />
+                                               <xs:attribute name="value" type="xs:float" />
+                                               <xs:attribute name="colour" type="xs:int" />
                                        </xs:complexType>
                                </xs:element>
                        </xs:sequence>
-                       <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:attribute name="id" type="xs:string" use="optional"/>
-                       <xs:attribute name="scoreOnly" type="xs:boolean" use="optional" default="false"/>
-                       <xs:attribute name="score" type="xs:double" use="optional"/>
-                       <xs:attribute name="visible" type="xs:boolean" use="optional"/>
+                       <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="groupRef" type="xs:string"
+                               use="optional" />
+                       <xs:attribute name="graphColour" type="xs:int"
+                               use="optional" />
+                       <xs:attribute name="graphGroup" type="xs:int"
+                               use="optional" />
+                       <xs:attribute name="id" type="xs:string" use="optional" />
+                       <xs:attribute name="scoreOnly" type="xs:boolean"
+                               use="optional" default="false" />
+                       <xs:attribute name="score" type="xs:double" use="optional" />
+                       <xs:attribute name="visible" type="xs:boolean"
+                               use="optional" />
+                       <xs:attribute name="centreColLabels" type="xs:boolean"
+                               use="optional" />
+                       <xs:attribute name="scaleColLabels" type="xs:boolean"
+                               use="optional" />
+                       <xs:attribute name="showAllColLabels" type="xs:boolean"
+                               use="optional" />
+
+
+                       <xs:attribute name="autoCalculated" type="xs:boolean" use="optional" default="false">
+                       <xs:annotation><xs:documentation>is an autocalculated annotation row</xs:documentation>
+                       </xs:annotation></xs:attribute>
                </xs:complexType>
        </xs:element>   
        <xs:element name="SequenceSet">