X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fjalview.xsd;h=055710eb96ed1a5dcc8d22294649f969459d1a9a;hb=24897f3311e222b758a86698a65a955d60e0af08;hp=6a959a28acb95b3fe7b8a59818cefcdfd52a7eb2;hpb=91f65cc4941c301408d739d15d31439dfb92f4c1;p=jalview.git

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 6a959a2..055710e 100755
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<xs:import namespace="www.vamsas.ac.uk/jalview/version2" schemaLocation="vamsas.xsd"/>
-<xs:import namespace="www.jalview.org/colours" schemaLocation="JalviewUserColours.xsd"/>
+		<xs:import namespace="www.vamsas.ac.uk/jalview/version2" schemaLocation="vamsas.xsd"/>
+	<xs:import namespace="www.jalview.org/colours" schemaLocation="JalviewUserColours.xsd"/>
 	<xs:complexType name="JalviewModel">
 		<xs:sequence>
 			<xs:element name="creationDate" type="xs:dateTime"/>
@@ -12,7 +12,29 @@
 					<xs:complexType>
 						<xs:sequence>
 							<xs:element name="features" type="jv:feature" minOccurs="0" maxOccurs="unbounded"/>
-							<xs:element name="pdbids" type="jv:pdbentry" minOccurs="0" maxOccurs="unbounded"/>
+							<xs:element name="pdbids" minOccurs="0" maxOccurs="unbounded">
+								<xs:complexType>
+									<xs:complexContent>
+										<xs:extension base="jv:pdbentry">
+											<xs:sequence>
+												<xs:element name="structureState" minOccurs="0" maxOccurs="unbounded">
+													<xs:complexType>
+														<xs:simpleContent>
+															<xs:extension base="xs:string">
+																<xs:attribute name="visible" type="xs:boolean"/>
+																<xs:attribute name="xpos" type="xs:int"/>
+																<xs:attribute name="ypos" type="xs:int"/>
+																<xs:attribute name="width" type="xs:int"/>
+																<xs:attribute name="height" type="xs:int"/>
+															</xs:extension>
+														</xs:simpleContent>
+													</xs:complexType>
+												</xs:element>
+											</xs:sequence>
+										</xs:extension>
+									</xs:complexContent>
+								</xs:complexType>
+							</xs:element>
 							<xs:element name="hiddenSequences" type="xs:int" minOccurs="0" maxOccurs="unbounded"/>
 						</xs:sequence>
 						<xs:attribute name="colour" type="xs:int" use="optional"/>
@@ -37,6 +59,9 @@
 						<xs:attribute name="displayBoxes" type="xs:boolean"/>
 						<xs:attribute name="displayText" type="xs:boolean"/>
 						<xs:attribute name="colourText" type="xs:boolean"/>
+						<xs:attribute name="textCol1" type="xs:int"/>
+						<xs:attribute name="textCol2" type="xs:int"/>
+						<xs:attribute name="textColThreshold" type="xs:int"/>
 					</xs:complexType>
 				</xs:element>
 				<xs:element name="Viewport" maxOccurs="unbounded">
@@ -66,6 +91,7 @@
 						<xs:attribute name="pidThreshold" type="xs:int"/>
 						<xs:attribute name="title" type="xs:string"/>
 						<xs:attribute name="showFullId" type="xs:boolean"/>
+						<xs:attribute name="rightAlignIds" type="xs:boolean"/>
 						<xs:attribute name="showText" type="xs:boolean"/>
 						<xs:attribute name="showColourText" type="xs:boolean"/>
 						<xs:attribute name="showBoxes" type="xs:boolean"/>
@@ -73,9 +99,6 @@
 						<xs:attribute name="renderGaps" type="xs:boolean"/>
 						<xs:attribute name="showSequenceFeatures" type="xs:boolean"/>
 						<xs:attribute name="showAnnotation" type="xs:boolean"/>
-						<xs:attribute name="showConservation" type="xs:boolean"/>
-						<xs:attribute name="showQuality" type="xs:boolean"/>
-						<xs:attribute name="showIdentity" type="xs:boolean"/>
 						<xs:attribute name="xpos" type="xs:int"/>
 						<xs:attribute name="ypos" type="xs:int"/>
 						<xs:attribute name="width" type="xs:int"/>
@@ -85,6 +108,12 @@
 						<xs:attribute name="fontName" type="xs:string"/>
 						<xs:attribute name="fontSize" type="xs:int"/>
 						<xs:attribute name="fontStyle" type="xs:int"/>
+						<xs:attribute name="viewName" type="xs:string"/>
+						<xs:attribute name="sequenceSetId" type="xs:string"/>
+						<xs:attribute name="gatheredViews" type="xs:boolean"/>
+						<xs:attribute name="textCol1" type="xs:int"/>
+						<xs:attribute name="textCol2" type="xs:int"/>
+						<xs:attribute name="textColThreshold" type="xs:int"/>
 					</xs:complexType>
 				</xs:element>
 				<xs:element name="UserColours" minOccurs="0" maxOccurs="unbounded">
@@ -133,12 +162,21 @@
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="feature">
+		<xs:sequence>
+			<xs:element name="otherData" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:attribute name="key" type="xs:string" use="required"/>
+					<xs:attribute name="value" type="xs:string" use="required"/>
+				</xs:complexType>
+			</xs:element>
+		</xs:sequence>
 		<xs:attribute name="begin" type="xs:int" use="required"/>
 		<xs:attribute name="end" type="xs:int" use="required"/>
 		<xs:attribute name="type" type="xs:string" use="required"/>
 		<xs:attribute name="description" type="xs:string" use="optional"/>
 		<xs:attribute name="status" type="xs:string" use="optional"/>
 		<xs:attribute name="featureGroup" type="xs:string" use="optional"/>
+		<xs:attribute name="score" type="xs:float" use="optional"/>
 	</xs:complexType>
 	<xs:complexType name="pdbentry">
 		<xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -151,5 +189,6 @@
 		</xs:sequence>
 		<xs:attribute name="id" type="xs:string" use="required"/>
 		<xs:attribute name="type" type="xs:string" use="optional"/>
+		<xs:attribute name="file" type="xs:string"/>
 	</xs:complexType>
 </xs:schema>