Skip to content

GitLab

Commit 1582bf61 authored by ankraft's avatar ankraft
Browse files

Merge branch 'ankraft-UML-fix'

parents 5032b1fa 598f942e
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 58 deletions
README.md
View file @ 1582bf61
...@@ -23,6 +23,8 @@ You can find further Information here: ...@@ -23,6 +23,8 @@ You can find further Information here:
- [Backlog & Issues](SDT/schema2.0/docs/Backlog.md) - [Backlog & Issues](SDT/schema2.0/docs/Backlog.md)
- [LICENSE](LICENSE) - [LICENSE](LICENSE)
## Changes in 2.0.1
- Added missing "uri" data type.
## Changes in 2.0 ## Changes in 2.0
- Introduced RootDevice to support hierarchical embedded devices. - Introduced RootDevice to support hierarchical embedded devices.
......
SDT/schema2.0/docs/SDT_Components.md
View file @ 1582bf61
...@@ -32,7 +32,7 @@ The syntax used in the diagram to model an XML Schema Definition (XSD) as an UML ...@@ -32,7 +32,7 @@ The syntax used in the diagram to model an XML Schema Definition (XSD) as an UML
### Domain ### Domain
The *Domain* is the top-level component that defines all modules and devices of a domain. A *Domain* can import definitions of other domains. The *Domain* is the top-level component that defines all modules and devices of a domain. A *Domain* can import definitions of other domains.
A *Domain* can define [Domain](#Domain) or [RootDevices](#RootDevice) only, or may choose to provide both. A *Domain* can define [Modules](#ModuleClass) or [RootDevices](#RootDevice) only, or may choose to provide both.
![](images/Domain.png) ![](images/Domain.png)
...@@ -42,7 +42,7 @@ A *Domain* can define [Domain](#Domain) or [RootDevices](#RootDevice) only, or m ...@@ -42,7 +42,7 @@ A *Domain* can define [Domain](#Domain) or [RootDevices](#RootDevice) only, or m
#### Elements #### Elements
- **Imports** : XML import/include of other XML files. Optional. - **Imports** : XML import/include of other XML files. Optional.
- **Modules** : A list of [Module](#ModuleClass) components that are global to the whole domain. Optional. - **Modules** : A list of [Module](#ModuleClass) components that are global to the whole domain. Optional.
- **RootDevices** : a List [RootDevices](#RootDevice) components. Optional. - **RootDevices** : a List of [RootDevices](#RootDevice) components. Optional.
#### Example #### Example
...@@ -65,15 +65,15 @@ A *Domain* can define [Domain](#Domain) or [RootDevices](#RootDevice) only, or m ...@@ -65,15 +65,15 @@ A *Domain* can define [Domain](#Domain) or [RootDevices](#RootDevice) only, or m
<a name="RootDevice"/></a> <a name="RootDevice"/></a>
### RootDevice ### RootDevice
A *RootDevice* is the description of a (physical) device that may contain optional embedded sub-devices. It represents the idea an appliance that is addressable on a Home Area Network where one or more sub-[Devices](#Devices) provide certain functionalities. A *RootDevice* is the description of a (physical) device that may contain optional embedded sub-devices. It represents the idea an appliance that is addressable on a Home Area Network where one or more sub-[Devices](#Devices) provide certain (possibly independent) functionalities.
An example is a connected power-strip where each of the sockets can be switched on and off individually. The power-strip itself can provide functions such as "all sockets off" and "overall power consumption". An example is a connected power-strip where each of the sockets can be switched on and off individually. The power-strip itself can provide own functions such as "all sockets off" and "overall power consumption".
If the *RootDevice* includes sub-[Devices](#Device) then each sub-device may be of the same type or of different types. The functionality ([Actions](#Action)) of the *RootDevice* may be different from the functionality of its sub-[Devices](#Device). If the *RootDevice* includes sub-[Devices](#Device) then each sub-device may be of the same type or of different types. The functionality ([Actions](#Action)) of the *RootDevice* may be different from the functionality of its sub-[Devices](#Device).
If the *RootDevice* does not include sub-devices then the *RootDevice* is the actual adressable device that provides all the functionality of the connected appliance. If the *RootDevice* does not include sub-devices then the *RootDevice* is the actual adressable device that provides all the functionality of the connected appliance.
*RootDevices* may define their own [ModuleClasses](#ModuleClass) or refer to predefined ModulesClasses of its or another *Domain*. *RootDevices* may define their own [ModuleClasses](#ModuleClass) or refer to predefined ModulesClasses of the same or another *Domain*.
![](images/RootDevice.png) ![](images/RootDevice.png)
...@@ -82,7 +82,7 @@ If the *RootDevice* does not include sub-devices then the *RootDevice* is the ac ...@@ -82,7 +82,7 @@ If the *RootDevice* does not include sub-devices then the *RootDevice* is the ac
#### Elements #### Elements
- **Doc** : Documentation for the *RootDevice*. Optional. - **[Doc](#Documentation)** : Documentation for the *RootDevice*. Optional.
- **Modules** : A list of [Module](#ModuleClass) components that are local to the *RootDevice*. Optional. - **Modules** : A list of [Module](#ModuleClass) components that are local to the *RootDevice*. Optional.
- **[DeviceInfo](#DeviceInfo)** : Further meta-data about the *RootDevice*. Optional. - **[DeviceInfo](#DeviceInfo)** : Further meta-data about the *RootDevice*. Optional.
- **Devices** : A list [Device](#Device) components. Optional. - **Devices** : A list [Device](#Device) components. Optional.
...@@ -115,7 +115,7 @@ If the *RootDevice* does not include sub-devices then the *RootDevice* is the ac ...@@ -115,7 +115,7 @@ If the *RootDevice* does not include sub-devices then the *RootDevice* is the ac
- **id** : The identifier for that *Device*. Required. - **id** : The identifier for that *Device*. Required.
#### Elements #### Elements
- **Doc** : Documentation for the *Device*. Optional. - **[Doc](#Documentation)** : Documentation for the *Device*. Optional.
- **Modules** : A list of [Module](#ModuleClass) components that are local to the *Device*. Optional. - **Modules** : A list of [Module](#ModuleClass) components that are local to the *Device*. Optional.
- **[DeviceInfo](#DeviceInfo)** : Further meta-data about the *Device*. Optional. - **[DeviceInfo](#DeviceInfo)** : Further meta-data about the *Device*. Optional.
...@@ -148,6 +148,8 @@ None. ...@@ -148,6 +148,8 @@ None.
- **FirmwareVersion** : Current version number of the firmware or other version information. Optional. - **FirmwareVersion** : Current version number of the firmware or other version information. Optional.
- **VendorURL** : A URL that points to further information for that device. This might be the product page on the web or an URL to the device manual. Optional. - **VendorURL** : A URL that points to further information for that device. This might be the product page on the web or an URL to the device manual. Optional.
- **SerialNumber** : The serial number or serial string. Optional. - **SerialNumber** : The serial number or serial string. Optional.
- **[Doc](#Documentation)** : Documentation for the *DeviceInfo*. Optional.
#### Example #### Example
...@@ -165,7 +167,7 @@ None. ...@@ -165,7 +167,7 @@ None.
### Module, ModuleClass ### Module, ModuleClass
The *Module* (or *ModuleClass*) represents the concept of a reusable module that defines the [Actions](#Action), [Data](#Data) and [Events](#Event) for a single functionality of a device. A connected device may contain or refer to single or multiple *ModuleClasses* to specify its inherent services it exposes for use by applications. The *Module* (or *ModuleClass*) represents the concept of a reusable module that defines the [Actions](#Action), [Data](#Data) and [Events](#Event) for a single functionality of a device. A connected device may contain or refer to single or multiple *ModuleClasses* to specify its inherent services it exposes for use by applications.
*ModuleClasses* can be defined by a domain (on the level of the [Domain](#Domain) component) or in [RootDevices](#RootDevice)/[Devices](#Device): The former are global to a [Domain](#Domain) and can be used (refered to) by all [RootDevices](#RootDevice)/[Devices](#Device) of a [Domain](#Domain); the later are local to the [RootDevices](#RootDevice)/[Devices](#Device) where it is defined in. *ModuleClasses* defined on the [Domain](#Domain) level can be imported and used by other domains. *ModuleClasses* can be defined by a domain (on the level of the [Domain](#Domain) component) or in [RootDevices](#RootDevice)/[Devices](#Device): The former *ModuleClasses* are global to a [Domain](#Domain) and can be used (refered to) by all [RootDevices](#RootDevice)/[Devices](#Device) of a [Domain](#Domain); the later are local to the [RootDevices](#RootDevice)/[Devices](#Device) where they are defined in. All *ModuleClasses* defined on the [Domain](#Domain) level can be imported and used by other domains.
New *ModuleClasses* can be defined by extending existing *ModuleClasses* to add new or overriding defined [Actions](#Action), [Data](#Data) and [Events](#Event). New *ModuleClasses* can be defined by extending existing *ModuleClasses* to add new or overriding defined [Actions](#Action), [Data](#Data) and [Events](#Event).
...@@ -179,7 +181,7 @@ New *ModuleClasses* can be defined by extending existing *ModuleClasses* to add ...@@ -179,7 +181,7 @@ New *ModuleClasses* can be defined by extending existing *ModuleClasses* to add
The element has the following attributes: The element has the following attributes:
- **domain** : Identifier / Reference of the [Domain](#Domain) of the extended *ModuleClass*. Required when *extends* is specified. - **domain** : Identifier / Reference of the [Domain](#Domain) of the extended *ModuleClass*. Required when *extends* is specified.
- **class** : Name of the *ModuleClass* in the [Domain](#Domain) thet is extended. - **class** : Name of the *ModuleClass* in the [Domain](#Domain) thet is extended.
- **Doc** : Documentation for the *ModuleClass*. Optional. - **[Doc](#Documentation)** : Documentation for the *ModuleClass*. Optional.
- **Actions** : A list of [Action](#Action) components, each defining a single action. Optional. - **Actions** : A list of [Action](#Action) components, each defining a single action. Optional.
- **Data** : A list of [Data](#Data) components. Optional. - **Data** : A list of [Data](#Data) components. Optional.
- **Events** : A list of [Event](#Event) components. Optional. - **Events** : A list of [Event](#Event) components. Optional.
...@@ -203,7 +205,9 @@ The element has the following attributes: ...@@ -203,7 +205,9 @@ The element has the following attributes:
<a name="Action"/></a> <a name="Action"/></a>
### Action ### Action
An *Action* is defines a single procedure call for a [ModuleClass](#ModuleClass). It is basically for calling a function on a physical device in order to set or request data, or to invoke an action at a [Device](#Device). An *Action* defines a single procedure call for a [ModuleClass](#ModuleClass). It is basically used for calling a function on a physical device in order to set or request data, or to invoke an action at a [Device](#Device). #
It is also possible that an *Action* results in calling multiple functions on the device. Examples for this are the assembly of single function calls into one *Action* in order to provide sanity checks on the arguments, or for managing and fullfil transactional function calls on the device.
![](images/Action.png) ![](images/Action.png)
...@@ -212,11 +216,11 @@ An *Action* is defines a single procedure call for a [ModuleClass](#ModuleClass) ...@@ -212,11 +216,11 @@ An *Action* is defines a single procedure call for a [ModuleClass](#ModuleClass)
- **type** : The return type of the *Action*. It must comply to one of the defined [DataTypes](#DataType). Optional. If no *type* is specified the *Action* does not return a value. - **type** : The return type of the *Action*. It must comply to one of the defined [DataTypes](#DataType). Optional. If no *type* is specified the *Action* does not return a value.
#### Elements #### Elements
- **Doc** : Documentation for the *Action*. Optional. - **[Doc](#Documentation)** : Documentation for the *Action*. Optional.
- **Arg** : Zero or more occurances of argument definitions for an *Action*. Optional. - **Arg** : Zero or more occurances of argument definitions for an *Action*. Optional.
The *Arg* has the following attributes and elements: The *Arg* has the following attributes and elements:
- **name** : The name of the *Arg*. Attribute. Required. - **name** : The name of the *Arg*. Attribute. Required.
- **type** : The type of the *Arg*. It must comply to one of the defined *DataTypes*. Attribute. Required. - **type** : The type of the *Arg*. It must comply to one of the defined [DataTypes](#DataType) Attribute. Required.
- **Doc** : Documentation for the *Arg* element. Optional. - **Doc** : Documentation for the *Arg* element. Optional.
#### Example #### Example
...@@ -241,7 +245,7 @@ The *Data* component represents a list of *DataPoints*. ...@@ -241,7 +245,7 @@ The *Data* component represents a list of *DataPoints*.
![](images/Data.png) ![](images/Data.png)
Though *DataPoints* only refer to single data points of a physical device it is possible to describe hierarchies by model the path to the data point in the hierarchy by a path-like structure like to the pathname of a UNIX file system. Here, the root node of the hierarchy is a slash (/ 0x2F) and the segments or nodes along the path are also separated by slashes. The actual datapoint is the last leaf at the path. Though *DataPoints* only refer to single data points of a physical device it is possible to describe hierarchies by model the path to the data point in the hierarchy by a path-like structure like to the pathname of a UNIX file system. Here, the root node of the hierarchy is a slash (/ 0x2F) and the segments or nodes along the path are also separated by slashes. The actual data point is the last leaf at the path.
In EBNF: In EBNF:
...@@ -263,7 +267,7 @@ A *DataPoint* has the following attributes and elements: ...@@ -263,7 +267,7 @@ A *DataPoint* has the following attributes and elements:
- **writable** : Boolean value that indicates whether this *DataPoint* is writable by an application. Attribute. Optional. Default: false. - **writable** : Boolean value that indicates whether this *DataPoint* is writable by an application. Attribute. Optional. Default: false.
- **readable** : Boolean value that indicates whether this *DataPoint* is readable by an application. Attribute. Optional. Default: false. - **readable** : Boolean value that indicates whether this *DataPoint* is readable by an application. Attribute. Optional. Default: false.
- **eventable** : Boolean value that indicates whether an internal or external change of this *DataPoint* raises an event. Attribute. Optional. Default: false. - **eventable** : Boolean value that indicates whether an internal or external change of this *DataPoint* raises an event. Attribute. Optional. Default: false.
- **Doc** : Documentation for the *DataPoint* element. Optional. - **[Doc](#Documentation)** : Documentation for the *DataPoint* element. Optional.
#### Example #### Example
...@@ -280,17 +284,17 @@ A *DataPoint* has the following attributes and elements: ...@@ -280,17 +284,17 @@ A *DataPoint* has the following attributes and elements:
### DataType ### DataType
The following *DataTypes* can be used in the SDT's [Action](#Action), *Arg* and [DataPoint](#Data) elements and attributes. If not stated otherwise datatypes should comply to the equivalent datatypes defined in [XML Schema Part 2: Datatypes Second Edition](http://www.w3.org/TR/xmlschema-2/#boolean): The following *DataTypes* can be used in the SDT's [Action](#Action), *Arg* and [DataPoint](#Data) elements and attributes. If not stated otherwise datatypes should comply to the equivalent datatypes defined in [XML Schema Part 2: Datatypes Second Edition](http://www.w3.org/TR/xmlschema-2/#boolean):
- **boolean** : A boolean value as defined by [http://www.w3.org/TR/xmlschema-2/#boolean](http://www.w3.org/TR/xmlschema-2/#boolean) . - **boolean** : A boolean value as defined in [http://www.w3.org/TR/xmlschema-2/#boolean](http://www.w3.org/TR/xmlschema-2/#boolean) .
- **byte** : An integer datatype with the range of [0 - 255] as defined by [http://www.w3.org/TR/xmlschema-2/#unsignedByte](http://www.w3.org/TR/xmlschema-2/#unsignedByte) . - **byte** : An integer datatype with the range of [0 - 255] as defined in [http://www.w3.org/TR/xmlschema-2/#unsignedByte](http://www.w3.org/TR/xmlschema-2/#unsignedByte) .
- **integer** : An integer value as defined by [http://www.w3.org/TR/xmlschema-2/#integer](http://www.w3.org/TR/xmlschema-2/#integer) . - **integer** : An integer value as defined in [http://www.w3.org/TR/xmlschema-2/#integer](http://www.w3.org/TR/xmlschema-2/#integer) .
- **float** : An IEEE single-precision 32-bit floating point type as defined by [http://www.w3.org/TR/xmlschema-2/#float](http://www.w3.org/TR/xmlschema-2/#float) . - **float** : An IEEE single-precision 32-bit floating point type as defined in [http://www.w3.org/TR/xmlschema-2/#float](http://www.w3.org/TR/xmlschema-2/#float) .
- **string** : The string datatype represents character strings as defined by [http://www.w3.org/TR/xmlschema-2/#string](http://www.w3.org/TR/xmlschema-2/#string) . - **string** : The string datatype represents character strings as defined in [http://www.w3.org/TR/xmlschema-2/#string](http://www.w3.org/TR/xmlschema-2/#string) .
- **enum** : A complete and orderd list of items in a collection. Items in an enumeration are separated by commas (, 0x2c) and must be of one of the datatypes defined here. Commas (, 0x2c) and backslashes (\ 0x5c) in enumaration items must be escaped by backslash. - **enum** : A complete and orderd list of items in a collection. Items in an enumeration are separated by commas (, 0x2c) and must be of one of the datatypes defined here. Commas (, 0x2c) and backslashes (\ 0x5c) in enumaration items must be escaped by backslash.
- **date** : A date value as defined by [http://www.w3.org/TR/xmlschema-2/#date](http://www.w3.org/TR/xmlschema-2/#date) . - **date** : A date value as defined in [http://www.w3.org/TR/xmlschema-2/#date](http://www.w3.org/TR/xmlschema-2/#date) .
- **time** : A time value as defined by [http://www.w3.org/TR/xmlschema-2/#time](http://www.w3.org/TR/xmlschema-2/#time) . - **time** : A time value as defined in [http://www.w3.org/TR/xmlschema-2/#time](http://www.w3.org/TR/xmlschema-2/#time) .
- **datetime** : A time value as defined by [http://www.w3.org/TR/xmlschema-2/#dateTime](http://www.w3.org/TR/xmlschema-2/#dateTime) . - **datetime** : A time value as defined in [http://www.w3.org/TR/xmlschema-2/#dateTime](http://www.w3.org/TR/xmlschema-2/#dateTime) .
- **blob** : A blob value represents a binary object. The internal encoding is transparent and not defined here. The binary object must be encoded conforming to [http://www.w3.org/TR/xmlschema-2/#base64Binary](http://www.w3.org/TR/xmlschema-2/#base64Binary) . - **blob** : A blob value represents a binary object. The internal encoding is transparent and not defined here. The binary object must be encoded conforming to [http://www.w3.org/TR/xmlschema-2/#base64Binary](http://www.w3.org/TR/xmlschema-2/#base64Binary) .
- **uri** : A URI that represents a Uniform Resource Identifier Reference (URI) as defined by as defined by [RFC 2396](http://www.ietf.org/rfc/rfc2396.txt) and amended by [RFC 2732](http://www.ietf.org/rfc/rfc2732.txt) . - **uri** : A URI that represents a Uniform Resource Identifier Reference (URI) as defined by as defined in [RFC 2396](http://www.ietf.org/rfc/rfc2396.txt) and amended in [RFC 2732](http://www.ietf.org/rfc/rfc2732.txt) .
--- ---
...@@ -305,7 +309,7 @@ An *Event* is a component that defines properties for events that are raised as ...@@ -305,7 +309,7 @@ An *Event* is a component that defines properties for events that are raised as
#### Elements #### Elements
- **Data** : A list of [Data](#Data) components for an event's payload. Optional. - **Data** : A list of [Data](#Data) components for an event's payload. Optional.
- **Doc** : Documentation for the *Event* Element. Optional. - **[Doc](#Documentation)** : Documentation for the *Event* Element. Optional.
#### Example #### Example
...@@ -321,7 +325,7 @@ An *Event* is a component that defines properties for events that are raised as ...@@ -321,7 +325,7 @@ An *Event* is a component that defines properties for events that are raised as
<a name="Documentation"/></a> <a name="Documentation"/></a>
# Documentation # Documentation
The *Doc* documentation element is optionally available in most components of the SDT. Its purpose is to provide a short documentation of the respective element. The *Doc* documentation element is optionally available in most components of the SDT. Its purpose is to provide a short explanation of the respective element.
The text inside the *Doc* element can be structure using a very limited subset of HTML elements. The possible structuring is defined in EBNF as follows: The text inside the *Doc* element can be structure using a very limited subset of HTML elements. The possible structuring is defined in EBNF as follows:
......
SDT/schema2.0/docs/SDT_UML.uxf
View file @ 1582bf61
<?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.2">
<zoom_level>9</zoom_level> <zoom_level>9</zoom_level>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
...@@ -46,7 +46,7 @@ fg=blue</panel_attributes> ...@@ -46,7 +46,7 @@ fg=blue</panel_attributes>
<w>117</w> <w>117</w>
<h>81</h> <h>81</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0,1 m1=0,1
</panel_attributes> </panel_attributes>
<additional_attributes>110.0;10.0;40.0;10.0;40.0;70.0;10.0;70.0</additional_attributes> <additional_attributes>110.0;10.0;40.0;10.0;40.0;70.0;10.0;70.0</additional_attributes>
...@@ -75,7 +75,7 @@ fg=blue</panel_attributes> ...@@ -75,7 +75,7 @@ fg=blue</panel_attributes>
<w>99</w> <w>99</w>
<h>36</h> <h>36</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0..*</panel_attributes> m1=0..*</panel_attributes>
<additional_attributes>90.0;10.0;10.0;10.0</additional_attributes> <additional_attributes>90.0;10.0;10.0;10.0</additional_attributes>
</element> </element>
...@@ -104,7 +104,7 @@ fg=blue</panel_attributes> ...@@ -104,7 +104,7 @@ fg=blue</panel_attributes>
<w>90</w> <w>90</w>
<h>180</h> <h>180</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1= 0..*</panel_attributes> m1= 0..*</panel_attributes>
<additional_attributes>80.0;10.0;30.0;10.0;30.0;180.0;10.0;180.0</additional_attributes> <additional_attributes>80.0;10.0;30.0;10.0;30.0;180.0;10.0;180.0</additional_attributes>
</element> </element>
...@@ -133,7 +133,7 @@ fg=blue</panel_attributes> ...@@ -133,7 +133,7 @@ fg=blue</panel_attributes>
<w>45</w> <w>45</w>
<h>180</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;180.0;10.0;140.0;30.0;140.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>
...@@ -165,7 +165,7 @@ fg=blue</panel_attributes> ...@@ -165,7 +165,7 @@ fg=blue</panel_attributes>
<w>90</w> <w>90</w>
<h>81</h> <h>81</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;40.0;10.0;40.0;70.0;10.0;70.0</additional_attributes> <additional_attributes>80.0;10.0;40.0;10.0;40.0;70.0;10.0;70.0</additional_attributes>
</element> </element>
...@@ -231,7 +231,7 @@ Extends ...@@ -231,7 +231,7 @@ Extends
<w>117</w> <w>117</w>
<h>45</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>110.0;20.0;10.0;20.0</additional_attributes> <additional_attributes>110.0;20.0;10.0;20.0</additional_attributes>
...@@ -244,7 +244,7 @@ m1=0..* ...@@ -244,7 +244,7 @@ m1=0..*
<w>99</w> <w>99</w>
<h>198</h> <h>198</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;&lt;-
m1=0,1 m1=0,1
</panel_attributes> </panel_attributes>
<additional_attributes>90.0;10.0;40.0;10.0;40.0;200.0;10.0;200.0</additional_attributes> <additional_attributes>90.0;10.0;40.0;10.0;40.0;200.0;10.0;200.0</additional_attributes>
...@@ -257,7 +257,7 @@ m1=0,1 ...@@ -257,7 +257,7 @@ m1=0,1
<w>81</w> <w>81</w>
<h>45</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;.. <panel_attributes>lt=&lt;.
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>70.0;20.0;10.0;20.0</additional_attributes> <additional_attributes>70.0;20.0;10.0;20.0</additional_attributes>
...@@ -270,7 +270,7 @@ m1=0..* ...@@ -270,7 +270,7 @@ m1=0..*
<w>45</w> <w>45</w>
<h>198</h> <h>198</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;&lt;-
m1= 1 m1= 1
</panel_attributes> </panel_attributes>
<additional_attributes>10.0;10.0;30.0;10.0;30.0;200.0;10.0;200.0</additional_attributes> <additional_attributes>10.0;10.0;30.0;10.0;30.0;200.0;10.0;200.0</additional_attributes>
...@@ -297,8 +297,8 @@ fg=blue</panel_attributes> ...@@ -297,8 +297,8 @@ fg=blue</panel_attributes>
<w>117</w> <w>117</w>
<h>153</h> <h>153</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0..* m1=0,1
</panel_attributes> </panel_attributes>
<additional_attributes>110.0;140.0;50.0;140.0;50.0;10.0;10.0;10.0</additional_attributes> <additional_attributes>110.0;140.0;50.0;140.0;50.0;10.0;10.0;10.0</additional_attributes>
</element> </element>
...@@ -310,7 +310,7 @@ m1=0..* ...@@ -310,7 +310,7 @@ m1=0..*
<w>72</w> <w>72</w>
<h>45</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>60.0;20.0;10.0;20.0</additional_attributes> <additional_attributes>60.0;20.0;10.0;20.0</additional_attributes>
...@@ -346,8 +346,8 @@ fg=blue ...@@ -346,8 +346,8 @@ fg=blue
<panel_attributes>Event <panel_attributes>Event
-- --
*@ name : text* *@ name : text*
/- data : Data/ - data : Data
- Doc : Doc /- Doc : Doc/
fg=blue</panel_attributes> fg=blue</panel_attributes>
<additional_attributes/> <additional_attributes/>
</element> </element>
...@@ -359,7 +359,7 @@ fg=blue</panel_attributes> ...@@ -359,7 +359,7 @@ fg=blue</panel_attributes>
<w>126</w> <w>126</w>
<h>261</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;260.0;30.0;260.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>
...@@ -384,7 +384,7 @@ fg=blue</panel_attributes> ...@@ -384,7 +384,7 @@ fg=blue</panel_attributes>
<w>72</w> <w>72</w>
<h>117</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;60.0;10.0;60.0;110.0;50.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>
...@@ -394,11 +394,11 @@ m1=0..* ...@@ -394,11 +394,11 @@ m1=0..*
<coordinates> <coordinates>
<x>306</x> <x>306</x>
<y>207</y> <y>207</y>
<w>90</w> <w>27</w>
<h>252</h> <h>252</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;&lt;&lt;. <panel_attributes>lt=&lt;&lt;-
&lt;&lt;extends&gt;&gt;</panel_attributes> </panel_attributes>
<additional_attributes>10.0;10.0;10.0;260.0</additional_attributes> <additional_attributes>10.0;10.0;10.0;260.0</additional_attributes>
</element> </element>
<element> <element>
...@@ -409,8 +409,8 @@ m1=0..* ...@@ -409,8 +409,8 @@ m1=0..*
<w>126</w> <w>126</w>
<h>144</h> <h>144</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0..* m1=1
</panel_attributes> </panel_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> <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>
...@@ -422,7 +422,7 @@ m1=0..* ...@@ -422,7 +422,7 @@ m1=0..*
<w>63</w> <w>63</w>
<h>351</h> <h>351</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;&lt;-
m1=1 m1=1
</panel_attributes> </panel_attributes>
<additional_attributes>10.0;10.0;50.0;10.0;50.0;370.0;10.0;370.0</additional_attributes> <additional_attributes>10.0;10.0;50.0;10.0;50.0;370.0;10.0;370.0</additional_attributes>
...@@ -453,7 +453,7 @@ fg=blue</panel_attributes> ...@@ -453,7 +453,7 @@ fg=blue</panel_attributes>
<w>90</w> <w>90</w>
<h>45</h> <h>45</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>80.0;20.0;10.0;20.0</additional_attributes> <additional_attributes>80.0;20.0;10.0;20.0</additional_attributes>
...@@ -475,7 +475,7 @@ fontsize=10 ...@@ -475,7 +475,7 @@ fontsize=10
/- optionalElement (0/1)/ /- optionalElement (0/1)/
/* optionalElement (0/n)/ /* optionalElement (0/n)/
"Contains" Relation "Depends" Relation
Subclassing</panel_attributes> Subclassing</panel_attributes>
<additional_attributes/> <additional_attributes/>
...@@ -488,7 +488,7 @@ Subclassing</panel_attributes> ...@@ -488,7 +488,7 @@ Subclassing</panel_attributes>
<w>90</w> <w>90</w>
<h>36</h> <h>36</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
fontsize=10 fontsize=10
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
...@@ -498,14 +498,13 @@ m1=0..* ...@@ -498,14 +498,13 @@ m1=0..*
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>108</x> <x>108</x>
<y>108</y> <y>117</y>
<w>99</w> <w>99</w>
<h>36</h> <h>27</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;&lt;&lt;. <panel_attributes>lt=&lt;&lt;-
&lt;&lt;extends&gt;&gt;
fontsize=10</panel_attributes> fontsize=10</panel_attributes>
<additional_attributes>90.0;20.0;10.0;20.0</additional_attributes> <additional_attributes>90.0;10.0;10.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
...@@ -515,7 +514,7 @@ fontsize=10</panel_attributes> ...@@ -515,7 +514,7 @@ fontsize=10</panel_attributes>
<w>90</w> <w>90</w>
<h>54</h> <h>54</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
m1=0..* m1=0..*
</panel_attributes> </panel_attributes>
<additional_attributes>80.0;10.0;30.0;10.0;30.0;40.0;10.0;40.0</additional_attributes> <additional_attributes>80.0;10.0;30.0;10.0;30.0;40.0;10.0;40.0</additional_attributes>
...@@ -528,7 +527,7 @@ m1=0..* ...@@ -528,7 +527,7 @@ m1=0..*
<w>324</w> <w>324</w>
<h>117</h> <h>117</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;- <panel_attributes>lt=&lt;.
</panel_attributes> </panel_attributes>
<additional_attributes>340.0;10.0;300.0;10.0;300.0;110.0;30.0;110.0;30.0;20.0;10.0;20.0</additional_attributes> <additional_attributes>340.0;10.0;300.0;10.0;300.0;110.0;30.0;110.0;30.0;20.0;10.0;20.0</additional_attributes>
</element> </element>
......
SDT/schema2.0/etc/domain.rnc
View file @ 1582bf61
...@@ -54,6 +54,7 @@ DataType = ...@@ -54,6 +54,7 @@ DataType =
| "time" | "time"
| "datetime" | "datetime"
| "blob" | "blob"
| "uri"
DocText = DocText =
(text (text
| element em { text } | element em { text }
......
SDT/schema2.0/src/domain.rng
View file @ 1582bf61
...@@ -130,6 +130,7 @@ ...@@ -130,6 +130,7 @@
<value>time</value> <value>time</value>
<value>datetime</value> <value>datetime</value>
<value>blob</value> <value>blob</value>
<value>uri</value>
</choice> </choice>
</define> </define>
......
SDT/schema2.0/src/domain.xsd
View file @ 1582bf61
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
<xs:enumeration value="time"/> <xs:enumeration value="time"/>