Skip to content

Commit e67eab7

Browse files
FinterlyFinterly
committed
Removed infobox, added rotation for all shaped elements
As per issue #83 and #84
1 parent 017b174 commit e67eab7

1 file changed

Lines changed: 12 additions & 53 deletions

File tree

‎GPML2021/GPML2021.xsd‎

Lines changed: 12 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@
164164
<xsd:documentation>The order of an object along the z-axis.</xsd:documentation>
165165
</xsd:annotation>
166166
</xsd:attribute>
167+
<xsd:attribute name="rotation" type="xsd:float" use="optional">
168+
<xsd:annotation>
169+
<xsd:documentation>A float value (rotation in radians).</xsd:documentation>
170+
</xsd:annotation>
171+
</xsd:attribute>
167172
</xsd:attributeGroup>
168173
<!--
169174
Line Style Properties in the order to be written.
@@ -306,13 +311,14 @@
306311
<!-- ###################################################################### -->
307312
<!--
308313
Pathway
309-
This is the root element of the structure.
314+
This is the root element of the structure. Meta-information (e.g. title, organism) are displayed in the info box of the pathway
315+
which is always in the top left corner.
310316
311317
Pathway properties in the order to be written in the gpml:
312318
- title, organism, source, version, license
313319
- Xref, Description, Authors
314320
- CommentGroup (Comment, Property, AnnotationRef, CitationRef, EvidenceRef)
315-
- Graphics (boardWidth, boardHeight, backgroundColor), InfoBox
321+
- Graphics (boardWidth, boardHeight, backgroundColor)
316322
- DataNodes, Interactions, GraphicalLines, Labels, Shapes, Groups
317323
- Annotations, Citations, Evidences
318324
-->
@@ -388,7 +394,6 @@
388394
</xsd:complexType>
389395
</xsd:element>
390396
<!-- End Graphics related attributes-->
391-
<xsd:element ref="gpml:InfoBox" minOccurs="1" maxOccurs="1"/>
392397
<xsd:element ref="gpml:DataNodes" minOccurs="0" maxOccurs="1"/>
393398
<xsd:element ref="gpml:Interactions" minOccurs="0" maxOccurs="1"/>
394399
<xsd:element ref="gpml:GraphicalLines" minOccurs="0" maxOccurs="1"/>
@@ -437,7 +442,7 @@
437442
DataNode properties in the order to be written:
438443
- elementId, textLabel, type, groupRef, elementRef
439444
- Xref, States
440-
- Graphics (RectAttributes, FontAttributes, ShapeStyleAttributes, rotation)
445+
- Graphics (RectAttributes, FontAttributes, ShapeStyleAttributes)
441446
- CommentGroup (Comment, Property, AnnotationRef, CitationRef, EvidenceRef)
442447
-->
443448
<xsd:element name="DataNodes">
@@ -465,11 +470,6 @@
465470
<xsd:attributeGroup ref="gpml:RectAttributes"/>
466471
<xsd:attributeGroup ref="gpml:FontAttributes"/>
467472
<xsd:attributeGroup ref="gpml:ShapeStyleAttributes"/>
468-
<xsd:attribute name="rotation" type="xsd:float" use="optional">
469-
<xsd:annotation>
470-
<xsd:documentation>A float value (rotation in radians).</xsd:documentation>
471-
</xsd:annotation>
472-
</xsd:attribute>
473473
</xsd:complexType>
474474
</xsd:element>
475475
<!-- End Graphics related attributes-->
@@ -539,7 +539,7 @@
539539
State properties in the order to be written:
540540
- elementId, textLabel, type
541541
- Xref
542-
- Graphics (relX, relY, width, height, FontAttributes, ShapeStyleAttributes, rotation)
542+
- Graphics (relX, relY, width, height, FontAttributes, ShapeStyleAttributes)
543543
- CommentGroup (Comment, Property, AnnotationRef, CitationRef, EvidenceRef)
544544
-->
545545
<xsd:element name="States">
@@ -581,11 +581,6 @@
581581
</xsd:attribute>
582582
<xsd:attributeGroup ref="gpml:FontAttributes"/>
583583
<xsd:attributeGroup ref="gpml:ShapeStyleAttributes"/>
584-
<xsd:attribute name="rotation" type="xsd:float" use="optional">
585-
<xsd:annotation>
586-
<xsd:documentation>A float value (rotation in radians).</xsd:documentation>
587-
</xsd:annotation>
588-
</xsd:attribute>
589584
</xsd:complexType>
590585
</xsd:element>
591586
<!-- End Graphics related attributes-->
@@ -755,7 +750,7 @@
755750
756751
Label properties in the order to be written:
757752
- elementId, textLabel, groupRef, href
758-
- Graphics (RectAttributes, FontAttributes, ShapeStyleAttributes, rotation)
753+
- Graphics (RectAttributes, FontAttributes, ShapeStyleAttributes)
759754
- CommentGroup (Comment, Property, AnnotationRef, CitationRef, EvidenceRef)
760755
-->
761756
<xsd:element name="Labels">
@@ -777,11 +772,6 @@
777772
<xsd:attributeGroup ref="gpml:RectAttributes"/>
778773
<xsd:attributeGroup ref="gpml:FontAttributes"/>
779774
<xsd:attributeGroup ref="gpml:ShapeStyleAttributes"/>
780-
<xsd:attribute name="rotation" type="xsd:float" use="optional">
781-
<xsd:annotation>
782-
<xsd:documentation>A float value (rotation in radians).</xsd:documentation>
783-
</xsd:annotation>
784-
</xsd:attribute>
785775
</xsd:complexType>
786776
</xsd:element>
787777
<!-- End Graphics related attributes-->
@@ -821,7 +811,7 @@
821811
822812
Shape properties in the order to be written:
823813
- elementId, textLabel, groupRef
824-
- Graphics (RectAttributes, FontAttributes, ShapeStyleAttributes, rotation)
814+
- Graphics (RectAttributes, FontAttributes, ShapeStyleAttributes)
825815
- CommentGroup (Comment, Property, AnnotationRef, CitationRef, EvidenceRef)
826816
-->
827817
<xsd:element name="Shapes">
@@ -843,11 +833,6 @@
843833
<xsd:attributeGroup ref="gpml:RectAttributes"/>
844834
<xsd:attributeGroup ref="gpml:FontAttributes"/>
845835
<xsd:attributeGroup ref="gpml:ShapeStyleAttributes"/>
846-
<xsd:attribute name="rotation" type="xsd:float" use="optional">
847-
<xsd:annotation>
848-
<xsd:documentation>A float value (rotation in radians).</xsd:documentation>
849-
</xsd:annotation>
850-
</xsd:attribute>
851836
</xsd:complexType>
852837
</xsd:element>
853838
<xsd:group ref="gpml:CommentGroup"/>
@@ -955,32 +940,6 @@
955940
</xsd:element>
956941
<!-- End: Groups -->
957942
<!-- ###################################################################### -->
958-
<!--
959-
InfoBox
960-
Holds the coordinates for where meta-information (e.g. title, organism) are displayed in the pathway.
961-
962-
InfoBox properties in the order to be written:
963-
- centerX, centerY
964-
-->
965-
<xsd:element name="InfoBox">
966-
<xsd:annotation>
967-
<xsd:documentation>The information box holds the coordinates for where information (e.g. title and organism) are displayed in the pathway.</xsd:documentation>
968-
</xsd:annotation>
969-
<xsd:complexType>
970-
<xsd:attribute name="centerX" type="xsd:float" use="required">
971-
<xsd:annotation>
972-
<xsd:documentation>The middle of the infobox in the x-direction.</xsd:documentation>
973-
</xsd:annotation>
974-
</xsd:attribute>
975-
<xsd:attribute name="centerY" type="xsd:float" use="required">
976-
<xsd:annotation>
977-
<xsd:documentation>The middle of the infobox in the x-direction.</xsd:documentation>
978-
</xsd:annotation>
979-
</xsd:attribute>
980-
</xsd:complexType>
981-
</xsd:element>
982-
<!-- End: InfoBox -->
983-
<!-- ###################################################################### -->
984943
<!--
985944
Annotations
986945
Pathway or pathway element AnnotationRefs refer to Annotations.

0 commit comments

Comments
 (0)