Skip to content
Snippets Groups Projects
Commit 215d20c6 authored by Andreas Kraft's avatar Andreas Kraft
Browse files

Made type of DataPoints required

parent 92eab929
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
SDT/schema2.0/docs/SDT_UML.uxf
+ 154
− 153
View file @ 215d20c6
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<diagram program="umlet" version="13.1"> <diagram program="umlet" version="13.1">
<zoom_level>10</zoom_level> <zoom_level>9</zoom_level>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>330</x> <x>261</x>
<y>120</y> <y>99</y>
<w>150</w> <w>135</w>
<h>130</h> <h>117</h>
</coordinates> </coordinates>
<panel_attributes>ModuleClass <panel_attributes>ModuleClass
-- --
...@@ -24,27 +24,27 @@ fg=blue ...@@ -24,27 +24,27 @@ fg=blue
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>580</x> <x>486</x>
<y>190</y> <y>162</y>
<w>140</w> <w>126</w>
<h>100</h> <h>90</h>
</coordinates> </coordinates>
<panel_attributes>Action <panel_attributes>Action
-- --
*@ name : text* *@ name : text*
/@ type : DataType/ /@ type : DataType/
/- Doc : Doc/ /- Doc : Doc/
/- Arg : Arg/ /* Arg : Arg/
fg=blue</panel_attributes> fg=blue</panel_attributes>
<additional_attributes/> <additional_attributes/>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>470</x> <x>387</x>
<y>100</y> <y>81</y>
<w>130</w> <w>117</w>
<h>90</h> <h>81</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0,1 m1=0,1
...@@ -54,10 +54,10 @@ m1=0,1 ...@@ -54,10 +54,10 @@ m1=0,1
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>800</x> <x>684</x>
<y>260</y> <y>225</y>
<w>160</w> <w>144</w>
<h>80</h> <h>72</h>
</coordinates> </coordinates>
<panel_attributes>Arg <panel_attributes>Arg
-- --
...@@ -70,10 +70,10 @@ fg=blue</panel_attributes> ...@@ -70,10 +70,10 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>710</x> <x>603</x>
<y>260</y> <y>225</y>
<w>110</w> <w>99</w>
<h>40</h> <h>36</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..*</panel_attributes> m1=0..*</panel_attributes>
...@@ -82,10 +82,10 @@ m1=0..*</panel_attributes> ...@@ -82,10 +82,10 @@ m1=0..*</panel_attributes>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>60</x> <x>18</x>
<y>230</y> <y>198</y>
<w>200</w> <w>180</w>
<h>100</h> <h>90</h>
</coordinates> </coordinates>
<panel_attributes>Domain <panel_attributes>Domain
-- --
...@@ -99,10 +99,10 @@ fg=blue</panel_attributes> ...@@ -99,10 +99,10 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>250</x> <x>189</x>
<y>120</y> <y>99</y>
<w>100</w> <w>90</w>
<h>200</h> <h>180</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1= 0..*</panel_attributes> m1= 0..*</panel_attributes>
...@@ -111,10 +111,10 @@ m1= 0..*</panel_attributes> ...@@ -111,10 +111,10 @@ m1= 0..*</panel_attributes>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>330</x> <x>261</x>
<y>600</y> <y>486</y>
<w>190</w> <w>171</w>
<h>100</h> <h>90</h>
</coordinates> </coordinates>
<panel_attributes>Device <panel_attributes>Device
-- --
...@@ -128,23 +128,23 @@ fg=blue</panel_attributes> ...@@ -128,23 +128,23 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>240</x> <x>180</x>
<y>300</y> <y>261</y>
<w>50</w> <w>45</w>
<h>250</h> <h>180</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>10.0;230.0;10.0;180.0;30.0;180.0;30.0;10.0;20.0;10.0</additional_attributes> <additional_attributes>10.0;180.0;10.0;140.0;30.0;140.0;30.0;10.0;20.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>590</x> <x>495</x>
<y>610</y> <y>495</y>
<w>180</w> <w>162</w>
<h>130</h> <h>117</h>
</coordinates> </coordinates>
<panel_attributes>DeviceInfo <panel_attributes>DeviceInfo
-- --
...@@ -160,10 +160,10 @@ fg=blue</panel_attributes> ...@@ -160,10 +160,10 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>510</x> <x>423</x>
<y>610</y> <y>495</y>
<w>100</w> <w>90</w>
<h>90</h> <h>81</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1= 0,1</panel_attributes> m1= 0,1</panel_attributes>
...@@ -172,10 +172,10 @@ m1= 0,1</panel_attributes> ...@@ -172,10 +172,10 @@ m1= 0,1</panel_attributes>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>800</x> <x>684</x>
<y>30</y> <y>18</y>
<w>160</w> <w>144</w>
<h>210</h> <h>189</h>
</coordinates> </coordinates>
<panel_attributes>&lt;&lt;Enumeration&gt;&gt; <panel_attributes>&lt;&lt;Enumeration&gt;&gt;
DataType DataType
...@@ -195,10 +195,10 @@ blob</panel_attributes> ...@@ -195,10 +195,10 @@ blob</panel_attributes>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>850</x> <x>729</x>
<y>650</y> <y>531</y>
<w>110</w> <w>99</w>
<h>50</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>Doc <panel_attributes>Doc
-- --
...@@ -209,10 +209,10 @@ fg=blue</panel_attributes> ...@@ -209,10 +209,10 @@ fg=blue</panel_attributes>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>580</x> <x>486</x>
<y>90</y> <y>72</y>
<w>130</w> <w>117</w>
<h>80</h> <h>72</h>
</coordinates> </coordinates>
<panel_attributes>&lt;&lt;Attributes&gt;&gt; <panel_attributes>&lt;&lt;Attributes&gt;&gt;
Extends Extends
...@@ -225,10 +225,10 @@ Extends ...@@ -225,10 +225,10 @@ Extends
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>470</x> <x>387</x>
<y>180</y> <y>153</y>
<w>130</w> <w>117</w>
<h>50</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
...@@ -238,10 +238,10 @@ m1=0..* ...@@ -238,10 +238,10 @@ m1=0..*
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>710</x> <x>603</x>
<y>40</y> <y>27</y>
<w>110</w> <w>99</w>
<h>220</h> <h>198</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0,1 m1=0,1
...@@ -251,10 +251,10 @@ m1=0,1 ...@@ -251,10 +251,10 @@ m1=0,1
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>780</x> <x>666</x>
<y>640</y> <y>522</y>
<w>90</w> <w>81</w>
<h>50</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;.. <panel_attributes>lt=&lt;..
m1=0..* m1=0..*
...@@ -264,10 +264,10 @@ m1=0..* ...@@ -264,10 +264,10 @@ m1=0..*
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>950</x> <x>819</x>
<y>110</y> <y>90</y>
<w>50</w> <w>45</w>
<h>220</h> <h>198</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1= 1 m1= 1
...@@ -277,10 +277,10 @@ m1= 1 ...@@ -277,10 +277,10 @@ m1= 1
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>580</x> <x>486</x>
<y>340</y> <y>297</y>
<w>170</w> <w>153</w>
<h>50</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>Data <panel_attributes>Data
-- --
...@@ -291,10 +291,10 @@ fg=blue</panel_attributes> ...@@ -291,10 +291,10 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>470</x> <x>387</x>
<y>210</y> <y>180</y>
<w>130</w> <w>117</w>
<h>170</h> <h>153</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
...@@ -304,10 +304,10 @@ m1=0..* ...@@ -304,10 +304,10 @@ m1=0..*
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>740</x> <x>630</x>
<y>350</y> <y>306</y>
<w>80</w> <w>72</w>
<h>50</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
...@@ -317,15 +317,15 @@ m1=0..* ...@@ -317,15 +317,15 @@ m1=0..*
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>800</x> <x>684</x>
<y>360</y> <y>315</y>
<w>160</w> <w>144</w>
<h>130</h> <h>117</h>
</coordinates> </coordinates>
<panel_attributes>DataPoint <panel_attributes>DataPoint
-- --
*@ name : text* *@ name : text*
/@ type : DataType/ @ type : DataType
/@ writable : boolean/ /@ writable : boolean/
/@ readable : boolean/ /@ readable : boolean/
/@ eventable : boolean/ /@ eventable : boolean/
...@@ -337,10 +337,10 @@ fg=blue ...@@ -337,10 +337,10 @@ fg=blue
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>590</x> <x>495</x>
<y>520</y> <y>414</y>
<w>160</w> <w>144</w>
<h>80</h> <h>72</h>
</coordinates> </coordinates>
<panel_attributes>Event <panel_attributes>Event
-- --
...@@ -353,23 +353,23 @@ fg=blue</panel_attributes> ...@@ -353,23 +353,23 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>470</x> <x>387</x>
<y>220</y> <y>189</y>
<w>140</w> <w>126</w>
<h>340</h> <h>261</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>120.0;310.0;30.0;310.0;30.0;10.0;10.0;10.0</additional_attributes> <additional_attributes>120.0;260.0;30.0;260.0;30.0;10.0;10.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>330</x> <x>261</x>
<y>550</y> <y>441</y>
<w>120</w> <w>135</w>
<h>30</h> <h>27</h>
</coordinates> </coordinates>
<panel_attributes>Module <panel_attributes>Module
fg=blue</panel_attributes> fg=blue</panel_attributes>
...@@ -378,48 +378,48 @@ fg=blue</panel_attributes> ...@@ -378,48 +378,48 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>440</x> <x>387</x>
<y>550</y> <y>441</y>
<w>110</w> <w>72</w>
<h>130</h> <h>117</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>10.0;10.0;90.0;10.0;90.0;110.0;80.0;110.0</additional_attributes> <additional_attributes>10.0;10.0;60.0;10.0;60.0;110.0;50.0;110.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>380</x> <x>306</x>
<y>240</y> <y>207</y>
<w>100</w> <w>90</w>
<h>330</h> <h>252</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;&lt;&lt;. <panel_attributes>lt=&lt;&lt;&lt;.
&lt;&lt;extends&gt;&gt;</panel_attributes> &lt;&lt;extends&gt;&gt;</panel_attributes>
<additional_attributes>10.0;10.0;10.0;310.0</additional_attributes> <additional_attributes>10.0;10.0;10.0;260.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>650</x> <x>549</x>
<y>380</y> <y>333</y>
<w>130</w> <w>126</w>
<h>210</h> <h>144</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>10.0;10.0;10.0;120.0;110.0;120.0;110.0;190.0;100.0;190.0</additional_attributes> <additional_attributes>10.0;10.0;10.0;70.0;120.0;70.0;120.0;140.0;100.0;140.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>950</x> <x>819</x>
<y>40</y> <y>27</y>
<w>70</w> <w>63</w>
<h>390</h> <h>351</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=1 m1=1
...@@ -429,10 +429,10 @@ m1=1 ...@@ -429,10 +429,10 @@ m1=1
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>70</x> <x>27</x>
<y>530</y> <y>423</y>
<w>190</w> <w>171</w>
<h>110</h> <h>99</h>
</coordinates> </coordinates>
<panel_attributes>RootDevice <panel_attributes>RootDevice
-- --
...@@ -447,10 +447,10 @@ fg=blue</panel_attributes> ...@@ -447,10 +447,10 @@ fg=blue</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>250</x> <x>189</x>
<y>590</y> <y>477</y>
<w>100</w> <w>90</w>
<h>50</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
...@@ -460,10 +460,10 @@ m1=0..* ...@@ -460,10 +460,10 @@ m1=0..*
<element> <element>
<id>UMLNote</id> <id>UMLNote</id>
<coordinates> <coordinates>
<x>60</x> <x>18</x>
<y>30</y> <y>18</y>
<w>200</w> <w>180</w>
<h>130</h> <h>126</h>
</coordinates> </coordinates>
<panel_attributes>bg=#FAF8C8 <panel_attributes>bg=#FAF8C8
fontsize=10 fontsize=10
...@@ -471,7 +471,8 @@ fontsize=10 ...@@ -471,7 +471,8 @@ fontsize=10
*@mandatoryElementAttribute* *@mandatoryElementAttribute*
- element - element
- element : Subclass - element : Subclass
/- optionalElement/ /- optionalElement (0/1)/
/* optionalElement (0/n)/
"Contains" Relation "Contains" Relation
...@@ -481,10 +482,10 @@ Subclassing</panel_attributes> ...@@ -481,10 +482,10 @@ Subclassing</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>160</x> <x>108</x>
<y>90</y> <y>81</y>
<w>100</w> <w>90</w>
<h>40</h> <h>36</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
fontsize=10 fontsize=10
...@@ -495,10 +496,10 @@ m1=0..* ...@@ -495,10 +496,10 @@ m1=0..*
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>160</x> <x>108</x>
<y>120</y> <y>108</y>
<w>110</w> <w>99</w>
<h>40</h> <h>36</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;&lt;&lt;. <panel_attributes>lt=&lt;&lt;&lt;.
&lt;&lt;extends&gt;&gt; &lt;&lt;extends&gt;&gt;
...@@ -508,10 +509,10 @@ fontsize=10</panel_attributes> ...@@ -508,10 +509,10 @@ fontsize=10</panel_attributes>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>250</x> <x>189</x>
<y>550</y> <y>441</y>
<w>100</w> <w>90</w>
<h>60</h> <h>54</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
m1=0..* m1=0..*
...@@ -521,10 +522,10 @@ m1=0..* ...@@ -521,10 +522,10 @@ m1=0..*
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>250</x> <x>189</x>
<y>610</y> <y>495</y>
<w>360</w> <w>324</w>
<h>130</h> <h>117</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;-
</panel_attributes> </panel_attributes>
......
SDT/schema2.0/docs/images/SDT2.0_UML.png
+ 0
− 0
View replaced file @ 92eab929 View file @ 215d20c6
SDT/schema2.0/docs/images/SDT2.0_UML.png

81 KiB | W: | H:

SDT/schema2.0/docs/images/SDT2.0_UML.png

81.7 KiB | W: | H:

SDT/schema2.0/docs/images/SDT2.0_UML.png
SDT/schema2.0/docs/images/SDT2.0_UML.png
SDT/schema2.0/docs/images/SDT2.0_UML.png
SDT/schema2.0/docs/images/SDT2.0_UML.png
  • 2-up
  • Swipe
  • Onion skin
SDT/schema2.0/etc/domain.rnc
+ 1
− 1
View file @ 215d20c6
...@@ -99,7 +99,7 @@ Data = ...@@ -99,7 +99,7 @@ Data =
element Data { element Data {
element DataPoint { element DataPoint {
attribute name { text }, attribute name { text },
attribute type { DataType }?, attribute type { DataType },
attribute writable { xsd:boolean }?, attribute writable { xsd:boolean }?,
attribute readable { xsd:boolean }?, attribute readable { xsd:boolean }?,
attribute eventable { xsd:boolean }?, attribute eventable { xsd:boolean }?,
......
SDT/schema2.0/src/domain.rng
+ 3
− 5
View file @ 215d20c6
...@@ -246,11 +246,9 @@ ...@@ -246,11 +246,9 @@
<attribute name="name"> <attribute name="name">
<text/> <text/>
</attribute> </attribute>
<optional>
<attribute name="type"> <attribute name="type">
<ref name="DataType"/> <ref name="DataType"/>
</attribute> </attribute>
</optional>
<optional> <optional>
<attribute name="writable"> <attribute name="writable">
<data type="boolean"/> <data type="boolean"/>
......
SDT/schema2.0/src/domain.xsd
+ 1
− 1
View file @ 215d20c6
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<xs:complexType> <xs:complexType>
<xs:group ref="Doc"/> <xs:group ref="Doc"/>
<xs:attribute name="name" use="required"/> <xs:attribute name="name" use="required"/>
<xs:attribute name="type" type="DataType"/> <xs:attribute name="type" use="required" type="DataType"/>
<xs:attribute name="writable" type="xs:boolean"/> <xs:attribute name="writable" type="xs:boolean"/>
<xs:attribute name="readable" type="xs:boolean"/> <xs:attribute name="readable" type="xs:boolean"/>
<xs:attribute name="eventable" type="xs:boolean"/> <xs:attribute name="eventable" type="xs:boolean"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment