Commit 0d8616ee authored by ankraft's avatar ankraft

Prepared merge

parent da51e62d
......@@ -290,7 +290,7 @@ lw=0.1</panel_attributes>
<coordinates>
<x>100</x>
<y>0</y>
<w>1590</w>
<w>1630</w>
<h>40</h>
</coordinates>
<panel_attributes>SDT 4.0 - Basic Elements
......@@ -347,12 +347,14 @@ fg=blue</panel_attributes>
<coordinates>
<x>1520</x>
<y>220</y>
<w>170</w>
<h>100</h>
<w>210</w>
<h>130</h>
</coordinates>
<panel_attributes>Arg
--
*@ name ; Name*
*@ name : Name*
/@ optional : boolean = false/
/@ default : text/
/- Doc : Doc/
/- semanticURI : uri/
- DataType : DataType
......@@ -384,10 +386,10 @@ m1= 0..n</panel_attributes>
*@ id : Name*
/- Doc : Doc/
/- semanticURI : uri/
/* imports/
/* Imports/
/* DataTypes : DataType/
/* ModuleClasses : ModuleClass/
/* Devices : Device/
/* DeviceClasses : DeviceClass/
fg=blue</panel_attributes>
<additional_attributes/>
</element>
......@@ -451,7 +453,7 @@ m1= 0..n</panel_attributes>
<coordinates>
<x>1520</x>
<y>500</y>
<w>170</w>
<w>210</w>
<h>50</h>
</coordinates>
<panel_attributes>Doc
......@@ -475,14 +477,14 @@ m1= 0..n
<element>
<id>Relation</id>
<coordinates>
<x>1440</x>
<x>1460</x>
<y>500</y>
<w>100</w>
<w>80</w>
<h>40</h>
</coordinates>
<panel_attributes>lt=&lt;.
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>
<id>Relation</id>
......@@ -503,7 +505,7 @@ m1= 0..n
<x>1170</x>
<y>270</y>
<w>220</w>
<h>160</h>
<h>180</h>
</coordinates>
<panel_attributes>DataPoint
--
......@@ -512,6 +514,7 @@ m1= 0..n
/@ writable : boolean = true/
/@ readable : boolean = true/
/@ eventable : boolean = false/
/@ default : text/
/- Doc : Doc/
/- semanticURI : uri/
- DataType : DataType
......@@ -524,7 +527,7 @@ fg=blue
<id>UMLClass</id>
<coordinates>
<x>1170</x>
<y>440</y>
<y>460</y>
<w>220</w>
<h>110</h>
</coordinates>
......@@ -545,12 +548,12 @@ fg=blue</panel_attributes>
<x>1040</x>
<y>290</y>
<w>150</w>
<h>190</h>
<h>210</h>
</coordinates>
<panel_attributes>lt=&lt;.
m1= 0..n
</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>
<id>Relation</id>
......@@ -645,12 +648,12 @@ transparency=80</panel_attributes>
<x>1380</x>
<y>250</y>
<w>80</w>
<h>260</h>
<h>280</h>
</coordinates>
<panel_attributes>lt=&lt;.
m1=0..n
</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>
<id>Relation</id>
......@@ -714,7 +717,7 @@ m1= 1
/* SubDevices : SubDevice/
/- DeviceClass/
/ @domain : IDRF/
/ @class : id /
/ @class : Name /
/ -ImplementedProperties : Property /
/ -ImplementedModuleClasses : ModuleClass /
/- 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