Commit 0d8616ee authored by ankraft's avatar ankraft

Prepared merge

parent da51e62d
...@@ -290,7 +290,7 @@ lw=0.1</panel_attributes> ...@@ -290,7 +290,7 @@ lw=0.1</panel_attributes>
<coordinates> <coordinates>
<x>100</x> <x>100</x>
<y>0</y> <y>0</y>
<w>1590</w> <w>1630</w>
<h>40</h> <h>40</h>
</coordinates> </coordinates>
<panel_attributes>SDT 4.0 - Basic Elements <panel_attributes>SDT 4.0 - Basic Elements
...@@ -347,12 +347,14 @@ fg=blue</panel_attributes> ...@@ -347,12 +347,14 @@ fg=blue</panel_attributes>
<coordinates> <coordinates>
<x>1520</x> <x>1520</x>
<y>220</y> <y>220</y>
<w>170</w> <w>210</w>
<h>100</h> <h>130</h>
</coordinates> </coordinates>
<panel_attributes>Arg <panel_attributes>Arg
-- --
*@ name ; Name* *@ name : Name*
/@ optional : boolean = false/
/@ default : text/
/- Doc : Doc/ /- Doc : Doc/
/- semanticURI : uri/ /- semanticURI : uri/
- DataType : DataType - DataType : DataType
...@@ -384,10 +386,10 @@ m1= 0..n</panel_attributes> ...@@ -384,10 +386,10 @@ m1= 0..n</panel_attributes>
*@ id : Name* *@ id : Name*
/- Doc : Doc/ /- Doc : Doc/
/- semanticURI : uri/ /- semanticURI : uri/
/* imports/ /* Imports/
/* DataTypes : DataType/ /* DataTypes : DataType/
/* ModuleClasses : ModuleClass/ /* ModuleClasses : ModuleClass/
/* Devices : Device/ /* DeviceClasses : DeviceClass/
fg=blue</panel_attributes> fg=blue</panel_attributes>
<additional_attributes/> <additional_attributes/>
</element> </element>
...@@ -451,7 +453,7 @@ m1= 0..n</panel_attributes> ...@@ -451,7 +453,7 @@ m1= 0..n</panel_attributes>
<coordinates> <coordinates>
<x>1520</x> <x>1520</x>
<y>500</y> <y>500</y>
<w>170</w> <w>210</w>
<h>50</h> <h>50</h>
</coordinates> </coordinates>
<panel_attributes>Doc <panel_attributes>Doc
...@@ -475,14 +477,14 @@ m1= 0..n ...@@ -475,14 +477,14 @@ m1= 0..n
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>1440</x> <x>1460</x>
<y>500</y> <y>500</y>
<w>100</w> <w>80</w>
<h>40</h> <h>40</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;. <panel_attributes>lt=&lt;.
m1=0..1</panel_attributes> m1=0..1</panel_attributes>
<additional_attributes>80.0;10.0;10.0;10.0</additional_attributes> <additional_attributes>60.0;10.0;10.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
...@@ -503,7 +505,7 @@ m1= 0..n ...@@ -503,7 +505,7 @@ m1= 0..n
<x>1170</x> <x>1170</x>
<y>270</y> <y>270</y>
<w>220</w> <w>220</w>
<h>160</h> <h>180</h>
</coordinates> </coordinates>
<panel_attributes>DataPoint <panel_attributes>DataPoint
-- --
...@@ -512,6 +514,7 @@ m1= 0..n ...@@ -512,6 +514,7 @@ m1= 0..n
/@ writable : boolean = true/ /@ writable : boolean = true/
/@ readable : boolean = true/ /@ readable : boolean = true/
/@ eventable : boolean = false/ /@ eventable : boolean = false/
/@ default : text/
/- Doc : Doc/ /- Doc : Doc/
/- semanticURI : uri/ /- semanticURI : uri/
- DataType : DataType - DataType : DataType
...@@ -524,7 +527,7 @@ fg=blue ...@@ -524,7 +527,7 @@ fg=blue
<id>UMLClass</id> <id>UMLClass</id>
<coordinates> <coordinates>
<x>1170</x> <x>1170</x>
<y>440</y> <y>460</y>
<w>220</w> <w>220</w>
<h>110</h> <h>110</h>
</coordinates> </coordinates>
...@@ -545,12 +548,12 @@ fg=blue</panel_attributes> ...@@ -545,12 +548,12 @@ fg=blue</panel_attributes>
<x>1040</x> <x>1040</x>
<y>290</y> <y>290</y>
<w>150</w> <w>150</w>
<h>190</h> <h>210</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;. <panel_attributes>lt=&lt;.
m1= 0..n m1= 0..n
</panel_attributes> </panel_attributes>
<additional_attributes>130.0;160.0;80.0;160.0;80.0;10.0;10.0;10.0</additional_attributes> <additional_attributes>130.0;180.0;80.0;180.0;80.0;10.0;10.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
...@@ -645,12 +648,12 @@ transparency=80</panel_attributes> ...@@ -645,12 +648,12 @@ transparency=80</panel_attributes>
<x>1380</x> <x>1380</x>
<y>250</y> <y>250</y>
<w>80</w> <w>80</w>
<h>260</h> <h>280</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;. <panel_attributes>lt=&lt;.
m1=0..n m1=0..n
</panel_attributes> </panel_attributes>
<additional_attributes>10.0;10.0;60.0;10.0;60.0;240.0;10.0;240.0</additional_attributes> <additional_attributes>10.0;10.0;60.0;10.0;60.0;260.0;10.0;260.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
...@@ -714,7 +717,7 @@ m1= 1 ...@@ -714,7 +717,7 @@ m1= 1
/* SubDevices : SubDevice/ /* SubDevices : SubDevice/
/- DeviceClass/ /- DeviceClass/
/ @domain : IDRF/ / @domain : IDRF/
/ @class : id / / @class : Name /
/ -ImplementedProperties : Property / / -ImplementedProperties : Property /
/ -ImplementedModuleClasses : ModuleClass / / -ImplementedModuleClasses : ModuleClass /
/- extends : Extends/ /- extends : Extends/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment