X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2FJalviewUserColours.xsd;h=d9923a844262860571a6d7b95c7b59ae32028bd0;hb=587d42166f0f5febf2e1c3f14d11540e3cb1452f;hp=3934d666f61db78470364f8e2844e0198202481d;hpb=14b1b2a878190d5fffda298c4b9a901c72c74ad3;p=jalview.git

diff --git a/schemas/JalviewUserColours.xsd b/schemas/JalviewUserColours.xsd
index 3934d66..d9923a8 100755
--- a/schemas/JalviewUserColours.xsd
+++ b/schemas/JalviewUserColours.xsd
@@ -17,6 +17,7 @@
   You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:jalview="www.jalview.org/colours" targetNamespace="www.jalview.org/colours">
+	<xs:element name="JalviewUserColours" type="jalview:JalviewUserColours" />
 	<xs:complexType name="JalviewUserColours">
 		<xs:sequence>
 			<xs:element name="Version" maxOccurs="1" minOccurs="0" type="xs:string">
@@ -43,15 +44,7 @@
 					<xs:attribute name="RGB" type="xs:string" use="required"/>
 					<xs:attribute name="minRGB" type="xs:string" use="optional"/>
 					<xs:attribute name="noValueColour" use="optional" type="jalview:NoValueColour" default="Min" />
-					<xs:attribute name="threshType" use="optional">
-						<xs:simpleType> 
-							<xs:restriction base="xs:string">
-						      <xs:enumeration value="NONE" />
-						      <xs:enumeration value="ABOVE" />
-						      <xs:enumeration value="BELOW" />
-						    </xs:restriction>	
-					    </xs:simpleType> 
-					</xs:attribute>
+					<xs:attribute name="threshType" use="optional" type="jalview:ThresholdType" />
 					<xs:attribute name="threshold" type="xs:float" use="optional"/>
 					<xs:attribute name="max" type="xs:float" use="optional"/>
 					<xs:attribute name="min" type="xs:float" use="optional"/>
@@ -102,16 +95,32 @@
 	    <xs:element name="condition" type="xs:string" /> 
 	    <xs:element name="value" type="xs:string" /> 
 	  </xs:sequence>
-	  <xs:attribute name="by">
-		<xs:simpleType> 
-			<xs:restriction base="xs:string">
-		      <xs:enumeration value="byLabel" />
-		      <xs:enumeration value="byScore" />
-		      <xs:enumeration value="byAttribute" />
-		    </xs:restriction>	
-	    </xs:simpleType> 
-	  </xs:attribute> 
-	</xs:complexType> 
+	  <xs:attribute name="by" type="jalview:FilterBy" />
+	</xs:complexType>
+
+	<xs:simpleType name="ThresholdType">
+		<xs:annotation>
+			<xs:documentation>Whether filter has a threshold, and if so is it
+				above or below
+			</xs:documentation>
+		</xs:annotation>
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="NONE" />
+			<xs:enumeration value="ABOVE" />
+			<xs:enumeration value="BELOW" />
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:simpleType name="FilterBy">
+	    	<xs:annotation>
+	    		<xs:documentation>Filter may apply to label, score or some feature attribute</xs:documentation>
+	    	</xs:annotation>
+		<xs:restriction base="xs:string">
+	      <xs:enumeration value="byLabel" />
+	      <xs:enumeration value="byScore" />
+	      <xs:enumeration value="byAttribute" />
+	    </xs:restriction>	
+	</xs:simpleType>
 	
 	<xs:simpleType name="NoValueColour">
 	    	<xs:annotation>