Commit 591110b6 authored by ankraft's avatar ankraft

Merge branch 'MAS-2018-0140-SDT_4_0_–_Adding_support_for_semantic_references'...

Merge branch 'MAS-2018-0140-SDT_4_0_–_Adding_support_for_semantic_references' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
parents 8a3b5cad dfd54a47
......@@ -123,8 +123,8 @@ fontsize=12</panel_attributes>
--
/@ name : Name/
/@ unitOfMeasure : text/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
- TypeChoice
/- Extend : Extend/
/* Constraints : Constraint/
......@@ -197,8 +197,8 @@ fontsize=12</panel_attributes>
*@ name : Name*
/@ type : BasicType/
/@ value : text/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
fg=blue</panel_attributes>
<additional_attributes/>
</element>
......@@ -312,8 +312,8 @@ lw=0.1</panel_attributes>
--
*@ name : Name*
/@ optional : boolean = false/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
/- Extend : Extend/
/* Properties : Property/
/* Actions : Action/
......@@ -335,8 +335,8 @@ fg=blue
--
*@ name : Name*
/@ optional : boolean = false/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
/- DataType : DataType/
/* Args : Arg/
fg=blue</panel_attributes>
......@@ -355,8 +355,8 @@ fg=blue</panel_attributes>
*@ name : Name*
/@ optional : boolean = false/
/@ default : text/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
- DataType : DataType
fg=blue</panel_attributes>
<additional_attributes/>
......@@ -385,8 +385,8 @@ fontsize=12</panel_attributes>
<panel_attributes>Domain
--
*@ id : Name*
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
/* Imports/
/* DataTypes : DataType/
/* ModuleClasses : ModuleClass/
......@@ -419,8 +419,8 @@ fontsize=12</panel_attributes>
<panel_attributes>SubDevice
--
*@ id : Name*
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
/* Properties : Property/
/* ModuleClasses : ModuleClass/
fg=blue</panel_attributes>
......@@ -520,8 +520,8 @@ fontsize=12</panel_attributes>
/@ readable : boolean = true/
/@ eventable : boolean = false/
/@ default : text/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
- DataType : DataType
fg=blue
......@@ -540,10 +540,9 @@ fg=blue
--
*@ name : Name*
/@ optional : boolean = false/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
/* Data : DataPoint/
fg=blue</panel_attributes>
<additional_attributes/>
</element>
......@@ -584,8 +583,8 @@ fontsize=12</panel_attributes>
<panel_attributes>DeviceClass
--
*@ id : Name*
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
/* Properties : Property/
/* ModuleClasses : ModuleClass/
/* SubDevices : SubDevice/
......@@ -641,8 +640,8 @@ fontsize=12</panel_attributes>
*@ name : Name*
/@ optional : boolean = false/
/@ value : text/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
- DataType : SimpleType
fg=blue
transparency=80</panel_attributes>
......@@ -783,8 +782,8 @@ fontsize=12</panel_attributes>
*@ name : Name*
*@ value : value*
/@ type : BasicType = integer/
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
fg=blue</panel_attributes>
<additional_attributes/>
</element>
......@@ -992,8 +991,8 @@ fontsize=12
<panel_attributes>Product
--
*@ id : Name*
/@ semanticURI : uri/
/- Doc : Doc/
/- semanticURI : uri/
/* Properties : Property/
/* ModuleClasses : ModuleClass/
/* SubDevices : SubDevice/
......
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