correct relative positionning of source/group

[blast.git] / projectfile.xsd

diff --git a/projectfile.xsd b/projectfile.xsd
index 36fe54e1123fe87c427072817fb40f8debdc1b4e..8fdab46ca82a675ecc0f801542c79d57c90468fa 100644 (file)
--- a/projectfile.xsd
+++ b/projectfile.xsd
@@ -16,7 +16,6 @@
     <xs:attributeGroup name="group_ifaceAttrGroup">
        <xs:attribute ref="id"/>
        <xs:attribute ref="name"/>
-       <xs:attribute ref="level"/>
        <xs:attribute ref="direction"/>
        <xs:attribute ref="orientation"/>
        <xs:attribute ref="position"/>
@@ -90,6 +89,14 @@
        </xs:simpleType>
     </xs:attribute>
 
+    <xs:attribute name="upper_scene">
+       <xs:simpleType>
+           <xs:restriction base="xs:integer">
+               <xs:minInclusive value="-1"/>
+           </xs:restriction>
+       </xs:simpleType>
+    </xs:attribute>
+
     <xs:attribute name="upper_group">
        <xs:simpleType>
            <xs:restriction base="xs:integer">
@@ -130,13 +137,7 @@
        </xs:simpleType>
     </xs:attribute>
 
-    <xs:attribute name="value">
-       <xs:simpleType>
-           <xs:restriction base="xs:nonNegativeInteger">
-               <xs:minInclusive value="0"/>
-           </xs:restriction>
-       </xs:simpleType>
-    </xs:attribute>
+    <xs:attribute name="value" type="xs:string"/>
 
     <xs:attribute name="from">
        <xs:simpleType>
@@ -156,7 +157,6 @@
 
     <xs:attribute name="position" type="xs:string"/>
     <xs:attribute name="dimension" type="xs:string"/>
-    <xs:attribute name="level" type="xs:string"/>
     <xs:attribute name="direction" type="xs:string"/>
     <xs:attribute name="orientation" type="xs:string"/>
     <xs:attribute name="name" type="xs:string"/>
@@ -184,9 +184,9 @@
     </xs:group>
 
     <xs:group name="block_itemsElmtGroup">
-       <xs:sequence>
-           <xs:element ref="bi_functional" minOccurs="0" maxOccurs="unbounded"/>
-           <xs:element ref="bi_group" minOccurs="0"/>
+      <xs:sequence>
+       <xs:element ref="bi_group" minOccurs="0" maxOccurs="unbounded"/>
+       <xs:element ref="bi_functional" minOccurs="0" maxOccurs="unbounded"/>
        </xs:sequence>
     </xs:group>
 
@@ -213,6 +213,7 @@
        <xs:complexType>
            <xs:group ref="sceneElmtGroup"/>
            <xs:attribute ref="id"/>
+           <xs:attribute ref="upper_scene"/>
        </xs:complexType>
     </xs:element>