diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf index d4dc9b4acfb8af42ebf67c6873e5f228e00f51b1..64d5e8def0669929dde3fe02a6f6d84c172dd0b4 100644 --- a/SDT/schema4.0/docs/SDT_UML.uxf +++ b/SDT/schema4.0/docs/SDT_UML.uxf @@ -5,8 +5,8 @@ <element> <id>UMLNote</id> <coordinates> - <x>1040</x> - <y>630</y> + <x>1390</x> + <y>650</y> <w>310</w> <h>260</h> </coordinates> @@ -29,42 +29,45 @@ Cardinalities: 1 : exact one 0..* : zero or many 1..* : at least one or many -</panel_attributes> + +group=1</panel_attributes> <additional_attributes/> </element> <element> <id>Relation</id> <coordinates> - <x>1170</x> - <y>730</y> + <x>1520</x> + <y>750</y> <w>110</w> <h>40</h> </coordinates> <panel_attributes>lt=<. fontsize=10 m1=0..* -</panel_attributes> + +group=1</panel_attributes> <additional_attributes>90.0;20.0;10.0;20.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>1170</x> - <y>770</y> + <x>1520</x> + <y>790</y> <w>110</w> <h>30</h> </coordinates> <panel_attributes>lt=<<- -fontsize=10</panel_attributes> +fontsize=10 +group=1</panel_attributes> <additional_attributes>90.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>1460</x> + <x>1580</x> <y>1090</y> <w>150</w> - <h>240</h> + <h>220</h> </coordinates> <panel_attributes><<enumeration>> BasicType @@ -74,7 +77,6 @@ byte integer float string -enum date time datetime @@ -86,44 +88,45 @@ void</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>840</x> + <x>960</x> <y>1170</y> <w>140</w> <h>80</h> </coordinates> <panel_attributes>lt=<<. -m1= 0,1 +m1= 0..1 </panel_attributes> <additional_attributes>120.0;50.0;60.0;50.0;60.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>840</x> + <x>960</x> <y>1090</y> <w>140</w> <h>80</h> </coordinates> <panel_attributes>lt=<<. -m1= 0,1 +m1=0..1 </panel_attributes> <additional_attributes>120.0;10.0;40.0;10.0;40.0;60.0;10.0;60.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>360</x> + <x>480</x> <y>1090</y> <w>190</w> - <h>130</h> + <h>150</h> </coordinates> <panel_attributes>DataType -- /@ name : text/ /@ unitOfMeasure : text/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ - TypeChoice +/- extends : Extends/ /* Constraints : Constraint/ fg=blue</panel_attributes> <additional_attributes/> @@ -131,33 +134,33 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>510</x> + <x>630</x> <y>1030</y> - <w>700</w> + <w>710</w> <h>130</h> </coordinates> <panel_attributes>lt=<<. -m2=1..* +m2=1..n </panel_attributes> - <additional_attributes>10.0;60.0;10.0;20.0;680.0;20.0;680.0;100.0;640.0;100.0</additional_attributes> + <additional_attributes>10.0;60.0;10.0;20.0;690.0;20.0;690.0;100.0;640.0;100.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>510</x> + <x>630</x> <y>1030</y> - <w>700</w> + <w>710</w> <h>190</h> </coordinates> <panel_attributes>lt=<<. m2=1 </panel_attributes> - <additional_attributes>10.0;60.0;10.0;20.0;680.0;20.0;680.0;160.0;640.0;160.0</additional_attributes> + <additional_attributes>10.0;60.0;10.0;20.0;690.0;20.0;690.0;160.0;640.0;160.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>960</x> + <x>1080</x> <y>1210</y> <w>190</w> <h>50</h> @@ -171,7 +174,7 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>1140</x> + <x>1260</x> <y>1230</y> <w>340</w> <h>50</h> @@ -184,7 +187,7 @@ m1= 1 <element> <id>UMLClass</id> <coordinates> - <x>960</x> + <x>1080</x> <y>1330</y> <w>190</w> <h>110</h> @@ -194,41 +197,41 @@ m1= 1 *@ name : text* /@ type : BasicType/ /@ value : text/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ fg=blue</panel_attributes> <additional_attributes/> </element> <element> <id>Relation</id> <coordinates> - <x>540</x> + <x>660</x> <y>1190</y> <w>440</w> <h>180</h> </coordinates> <panel_attributes>lt=<. -m1=0..* +m1=0..n </panel_attributes> <additional_attributes>420.0;150.0;80.0;150.0;80.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>1140</x> - <y>1320</y> + <x>1260</x> + <y>1300</y> <w>420</w> - <h>120</h> + <h>140</h> </coordinates> <panel_attributes>lt=<<- m1=1 </panel_attributes> - <additional_attributes>390.0;10.0;390.0;100.0;10.0;100.0</additional_attributes> + <additional_attributes>390.0;10.0;390.0;120.0;10.0;120.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>960</x> + <x>1080</x> <y>1090</y> <w>190</w> <h>50</h> @@ -242,7 +245,7 @@ fg=blue</panel_attributes> <element> <id>UMLClass</id> <coordinates> - <x>960</x> + <x>1080</x> <y>1150</y> <w>190</w> <h>50</h> @@ -256,13 +259,13 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>840</x> + <x>960</x> <y>1140</y> <w>140</w> <h>50</h> </coordinates> <panel_attributes>lt=<<. -m1= 0,1 +m1= 0..1 </panel_attributes> <additional_attributes>120.0;20.0;10.0;20.0</additional_attributes> @@ -270,7 +273,7 @@ m1= 0,1 <element> <id>UMLClass</id> <coordinates> - <x>360</x> + <x>480</x> <y>950</y> <w>1250</w> <h>40</h> @@ -285,9 +288,9 @@ lw=0.1</panel_attributes> <element> <id>UMLClass</id> <coordinates> - <x>0</x> + <x>100</x> <y>0</y> - <w>1570</w> + <w>1590</w> <h>40</h> </coordinates> <panel_attributes>SDT 4.0 - Basic Elements @@ -300,20 +303,18 @@ lw=0.1</panel_attributes> <element> <id>UMLClass</id> <coordinates> - <x>710</x> + <x>830</x> <y>130</y> <w>220</w> - <h>210</h> + <h>180</h> </coordinates> <panel_attributes>ModuleClass -- *@ name : text* /@ optional : boolean = false/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ -/- extends/ -/ @domain : IDRF/ -/ @class : text / +/- extends : Extends/ /* Properties : Property/ /* Actions : Action/ /* Data : DataPoint/ @@ -325,7 +326,7 @@ fg=blue <element> <id>UMLClass</id> <coordinates> - <x>1050</x> + <x>1170</x> <y>130</y> <w>220</w> <h>130</h> @@ -334,8 +335,8 @@ fg=blue -- *@ name : text* /@ optional : boolean = false/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ /- DataType : DataType/ /* Args : Arg/ fg=blue</panel_attributes> @@ -344,7 +345,7 @@ fg=blue</panel_attributes> <element> <id>UMLClass</id> <coordinates> - <x>1400</x> + <x>1520</x> <y>220</y> <w>170</w> <h>100</h> @@ -352,8 +353,8 @@ fg=blue</panel_attributes> <panel_attributes>Arg -- *@ name ; text* +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ - DataType : DataType fg=blue</panel_attributes> <additional_attributes/> @@ -361,29 +362,30 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>1260</x> + <x>1380</x> <y>220</y> <w>160</w> <h>40</h> </coordinates> <panel_attributes>lt=<. -m1= 0..*</panel_attributes> +m1= 0..n</panel_attributes> <additional_attributes>140.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>370</x> + <x>490</x> <y>130</y> <w>220</w> - <h>130</h> + <h>150</h> </coordinates> <panel_attributes>Domain -- *@ id : ID* +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ /* imports/ +/* DataTypes : DataType/ /* ModuleClasses : ModuleClass/ /* Devices : Device/ fg=blue</panel_attributes> @@ -392,19 +394,19 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>580</x> + <x>700</x> <y>130</y> <w>150</w> <h>100</h> </coordinates> <panel_attributes>lt=<. -m1= 0..*</panel_attributes> +m1= 0..n</panel_attributes> <additional_attributes>130.0;10.0;50.0;10.0;50.0;80.0;10.0;80.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>370</x> + <x>490</x> <y>440</y> <w>220</w> <h>110</h> @@ -412,8 +414,8 @@ m1= 0..*</panel_attributes> <panel_attributes>SubDevice -- *@ id : Name* +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ /* Properties : Property/ /* ModuleClasses : ModuleClass/ fg=blue</panel_attributes> @@ -422,32 +424,32 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>580</x> + <x>700</x> <y>220</y> <w>70</w> <h>120</h> </coordinates> <panel_attributes>lt=<. -m1=0..* +m1=0..n </panel_attributes> <additional_attributes>10.0;90.0;50.0;90.0;50.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>580</x> + <x>700</x> <y>440</y> <w>150</w> <h>70</h> </coordinates> <panel_attributes>lt=<. -m1= 0..*</panel_attributes> +m1= 0..n</panel_attributes> <additional_attributes>130.0;10.0;60.0;10.0;60.0;50.0;10.0;50.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>1400</x> + <x>1520</x> <y>500</y> <w>170</w> <h>50</h> @@ -460,46 +462,45 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>920</x> + <x>1040</x> <y>130</y> <w>150</w> <h>70</h> </coordinates> <panel_attributes>lt=<. -m1= 0..* +m1= 0..n </panel_attributes> <additional_attributes>130.0;10.0;50.0;10.0;50.0;50.0;10.0;50.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>1320</x> - <y>490</y> + <x>1440</x> + <y>500</y> <w>100</w> - <h>50</h> + <h>40</h> </coordinates> <panel_attributes>lt=<. -m1=0,1 -</panel_attributes> - <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes> +m1=0..1</panel_attributes> + <additional_attributes>80.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>920</x> + <x>1040</x> <y>190</y> <w>150</w> <h>120</h> </coordinates> <panel_attributes>lt=<. -m1= 0..* +m1= 0..n </panel_attributes> <additional_attributes>130.0;90.0;50.0;90.0;50.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>1050</x> + <x>1170</x> <y>270</y> <w>220</w> <h>160</h> @@ -511,8 +512,8 @@ m1= 0..* /@ writable : boolean = true/ /@ readable : boolean = true/ /@ eventable : boolean = false/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ - DataType : DataType fg=blue @@ -522,7 +523,7 @@ fg=blue <element> <id>UMLClass</id> <coordinates> - <x>1050</x> + <x>1170</x> <y>440</y> <w>220</w> <h>110</h> @@ -531,8 +532,8 @@ fg=blue -- *@ name : text* /@ optional : boolean = false/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ /* Data : DataPoint/ fg=blue</panel_attributes> @@ -541,20 +542,20 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>920</x> - <y>300</y> + <x>1040</x> + <y>290</y> <w>150</w> - <h>180</h> + <h>190</h> </coordinates> <panel_attributes>lt=<. -m1= 0..* +m1= 0..n </panel_attributes> - <additional_attributes>130.0;150.0;80.0;150.0;80.0;10.0;10.0;10.0</additional_attributes> + <additional_attributes>130.0;160.0;80.0;160.0;80.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>580</x> + <x>700</x> <y>290</y> <w>150</w> <h>240</h> @@ -567,7 +568,7 @@ m1= 0..* <element> <id>UMLClass</id> <coordinates> - <x>370</x> + <x>490</x> <y>300</y> <w>220</w> <h>130</h> @@ -575,8 +576,8 @@ m1= 0..* <panel_attributes>DeviceClass -- *@ id : Name* +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ /* Properties : Property/ /* ModuleClasses : ModuleClass/ /* SubDevices : SubDevice/ @@ -586,33 +587,31 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>580</x> + <x>700</x> <y>390</y> <w>70</w> <h>100</h> </coordinates> <panel_attributes>lt=<. -m1=0..* -</panel_attributes> +m1=0..n</panel_attributes> <additional_attributes>10.0;70.0;40.0;70.0;40.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>580</x> + <x>700</x> <y>290</y> <w>150</w> <h>90</h> </coordinates> <panel_attributes>lt=<. -m1= 0..* -</panel_attributes> +m1= 0..n</panel_attributes> <additional_attributes>130.0;10.0;80.0;10.0;80.0;70.0;10.0;70.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>580</x> + <x>700</x> <y>370</y> <w>150</w> <h>100</h> @@ -623,7 +622,7 @@ m1= 0..* <element> <id>UMLClass</id> <coordinates> - <x>710</x> + <x>830</x> <y>420</y> <w>220</w> <h>130</h> @@ -633,8 +632,8 @@ m1= 0..* *@ name : text* /@ optional : boolean = false/ /@ value : text/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ - DataType : SimpleType fg=blue transparency=80</panel_attributes> @@ -643,32 +642,32 @@ transparency=80</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>1260</x> + <x>1380</x> <y>250</y> <w>80</w> <h>260</h> </coordinates> <panel_attributes>lt=<. -m1=0..* +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> </element> <element> <id>Relation</id> <coordinates> - <x>920</x> - <y>320</y> + <x>1040</x> + <y>290</y> <w>70</w> - <h>160</h> + <h>190</h> </coordinates> <panel_attributes>lt=<. -m1=0..*</panel_attributes> - <additional_attributes>10.0;130.0;50.0;130.0;50.0;10.0;10.0;10.0</additional_attributes> +m1=0..n</panel_attributes> + <additional_attributes>10.0;160.0;40.0;160.0;40.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>660</x> + <x>780</x> <y>1100</y> <w>190</w> <h>110</h> @@ -687,7 +686,7 @@ Enum : EnumType <element> <id>Relation</id> <coordinates> - <x>540</x> + <x>660</x> <y>1110</y> <w>140</w> <h>80</h> @@ -700,16 +699,16 @@ m1= 1 <element> <id>UMLClass</id> <coordinates> - <x>0</x> - <y>300</y> - <w>300</w> - <h>250</h> + <x>100</x> + <y>320</y> + <w>330</w> + <h>230</h> </coordinates> <panel_attributes>Product -- *@ id : Name* +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ /* Properties : Property/ /* ModuleClasses : ModuleClass/ /* SubDevices : SubDevice/ @@ -718,66 +717,63 @@ m1= 1 / @class : id / / -ImplementedProperties : Property / / -ImplementedModuleClasses : ModuleClass / -/- Extends/ -/ @domain : IDRF/ -/ @class : id / +/- extends : Extends/ fg=blue</panel_attributes> <additional_attributes/> </element> <element> <id>Relation</id> <coordinates> - <x>290</x> - <y>290</y> - <w>100</w> + <x>420</x> + <y>310</y> + <w>90</w> <h>50</h> </coordinates> <panel_attributes>lt=<. m1=0..1 </panel_attributes> - <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes> + <additional_attributes>70.0;20.0;10.0;20.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>190</x> + <x>280</x> <y>100</y> - <w>540</w> - <h>220</h> + <w>570</w> + <h>240</h> </coordinates> <panel_attributes>lt=<. -m1= 0..*</panel_attributes> - <additional_attributes>520.0;40.0;440.0;40.0;440.0;10.0;10.0;10.0;10.0;200.0</additional_attributes> +</panel_attributes> + <additional_attributes>550.0;40.0;470.0;40.0;470.0;10.0;10.0;10.0;10.0;220.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>190</x> + <x>280</x> <y>520</y> - <w>540</w> + <w>570</w> <h>90</h> </coordinates> <panel_attributes>lt=<. -m1= 0..*</panel_attributes> - <additional_attributes>520.0;10.0;430.0;10.0;430.0;70.0;10.0;70.0;10.0;30.0</additional_attributes> +m1= 0..n</panel_attributes> + <additional_attributes>550.0;10.0;460.0;10.0;460.0;70.0;10.0;70.0;10.0;30.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>290</x> - <y>430</y> - <w>100</w> - <h>50</h> + <x>420</x> + <y>440</y> + <w>90</w> + <h>40</h> </coordinates> <panel_attributes>lt=<. -m1=0..* -</panel_attributes> - <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes> +m1=0..n</panel_attributes> + <additional_attributes>70.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>960</x> + <x>1080</x> <y>1270</y> <w>190</w> <h>50</h> @@ -791,20 +787,20 @@ fg=blue</panel_attributes> <element> <id>Relation</id> <coordinates> - <x>840</x> + <x>960</x> <y>1180</y> <w>140</w> <h>130</h> </coordinates> <panel_attributes>lt=<<. -m1= 0,1 +m1=0..1 </panel_attributes> <additional_attributes>120.0;100.0;50.0;100.0;50.0;10.0;10.0;10.0</additional_attributes> </element> <element> <id>UMLClass</id> <coordinates> - <x>1210</x> + <x>1330</x> <y>1290</y> <w>210</w> <h>110</h> @@ -814,35 +810,91 @@ m1= 0,1 *@ name : text* *@ value : value* /@ type : BasicType = integer/ +/@ semanticURI : uri/ /- Doc : Doc/ -/- semanticURI : uri/ fg=blue</panel_attributes> <additional_attributes/> </element> <element> <id>Relation</id> <coordinates> - <x>1140</x> + <x>1260</x> <y>1280</y> <w>90</w> <h>50</h> </coordinates> <panel_attributes>lt=<<. -m1= 1..* +m1=1..n </panel_attributes> <additional_attributes>70.0;20.0;10.0;20.0</additional_attributes> </element> <element> <id>Relation</id> <coordinates> - <x>1410</x> - <y>1320</y> - <w>110</w> - <h>60</h> + <x>1530</x> + <y>1300</y> + <w>120</w> + <h>80</h> </coordinates> <panel_attributes>lt=<<- -m1=0,1 +m1=0..1</panel_attributes> + <additional_attributes>70.0;10.0;70.0;60.0;10.0;60.0</additional_attributes> + </element> + <element> + <id>UMLClass</id> + <coordinates> + <x>490</x> + <y>630</y> + <w>220</w> + <h>80</h> + </coordinates> + <panel_attributes>Extends +-- +*@domain : IDRF* +*@class : id* +/- exclude : Exclude/ + +fg=blue</panel_attributes> + <additional_attributes/> + </element> + <element> + <id>UMLClass</id> + <coordinates> + <x>830</x> + <y>630</y> + <w>220</w> + <h>70</h> + </coordinates> + <panel_attributes>Exclude +-- +*@name : text* +/@type : text = datapoint/ +fg=blue</panel_attributes> + <additional_attributes/> + </element> + <element> + <id>Relation</id> + <coordinates> + <x>700</x> + <y>630</y> + <w>150</w> + <h>80</h> + </coordinates> + <panel_attributes>lt=<. +m1= 0..n</panel_attributes> + <additional_attributes>130.0;10.0;40.0;10.0;40.0;60.0;10.0;60.0</additional_attributes> + </element> + <element> + <id>Relation</id> + <coordinates> + <x>410</x> + <y>620</y> + <w>100</w> + <h>50</h> + </coordinates> + <panel_attributes>lt=<. +m1=0..1 </panel_attributes> - <additional_attributes>70.0;10.0;70.0;40.0;10.0;40.0</additional_attributes> + <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes> </element> </diagram> diff --git a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png index ef87ed3547cb0315a8f863f0110ed470523096f5..d9614aee8d59eadc91ddb0f5498aca0ce704be92 100644 Binary files a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png and b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png differ diff --git a/SDT/schema4.0/docs/images/SDT_UML_DataType.png b/SDT/schema4.0/docs/images/SDT_UML_DataType.png index 8a77daf4a139323743cb8c23ad7a7fb67eac94fb..4a0cfffa5c9d8622332858c3e3a47b4e17bd2e4e 100644 Binary files a/SDT/schema4.0/docs/images/SDT_UML_DataType.png and b/SDT/schema4.0/docs/images/SDT_UML_DataType.png differ