Skip to content

Commit 91536ae

Browse files
committed
Split out signature from metadata group, adjust all images
1 parent f0f47d1 commit 91536ae

36 files changed

+57
-26
lines changed

docs/4___common_content.adoc

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -479,23 +479,21 @@ This attribute references another connector by name, that gives the size of this
479479
[#ssc_metadata]
480480
==== MetaData Sequence
481481

482-
image:images/SystemStructureCommon_GMetaData.png[image,width=597,height=196]
482+
image:images/SystemStructureCommon_GMetaData.png[image,width=690,height=197]
483483

484-
The group GMetaData allows the specification of additional meta data and signatures for a given model element.
485-
Multiple (or no) MetaData and Signature elements may be present in a given model element.
484+
The group GMetaData allows the specification of additional meta data for a given model element.
485+
Multiple (or no) MetaData elements may be present in a given model element.
486486

487487
[width="100%",cols="33%,67%",options="header",]
488488
|===
489489
|Element |Description
490490
|MetaData |One or more instances of this element *CAN* be present to specify meta data related to the containing model element.
491491
See below for details.
492-
|Signature |One or more instances of this element *CAN* be present to specify signatures related to the containing model element.
493-
See below for details.
494492
|===
495493

496494
===== MetaData
497495

498-
image:images/SystemStructureCommon_MetaData.png[image,width=369,height=543]
496+
image:images/SystemStructureCommon_MetaData.png[image,width=462,height=479]
499497

500498
This element specifies a source of meta data related to the containing model element.
501499

@@ -541,16 +539,31 @@ The last option allows the specification of meta data sources that reside inside
541539

542540
===== Content
543541

544-
image:images/SystemStructureCommon_Content.png[image,width=377,height=306]
542+
image:images/SystemStructureCommon_Content.png[image,width=372,height=191]
545543

546544
This element specifies the inlined content of the model element meta data.
547545

548546
When this element is present, its contents *MUST* be an `srmd:SimulationResourceMetaData` element as specified by the SRMD schema of the SSP Traceability Specification, if the type attribute of the enclosing MetaData element is `application/x-srmd-meta-data`, or any other valid XML content if the type attribute references another MIME type.
549547
In that case there *SHOULD* be a layered specification that defines how embedding the content works for that MIME type.
550548

549+
[#ssc_signature]
550+
==== Signature Sequence
551+
552+
image:images/SystemStructureCommon_GSignature.png[image,width=652,height=133]
553+
554+
The group GSignautre allows the specification of digital signatures for a given model element.
555+
Multiple (or no) Signature elements may be present in a given model element.
556+
557+
[width="100%",cols="33%,67%",options="header",]
558+
|===
559+
|Element |Description
560+
|Signature |One or more instances of this element *CAN* be present to specify signatures related to the containing model element.
561+
See below for details.
562+
|===
563+
551564
===== Signature
552565

553-
image:images/SystemStructureCommon_Signature.png[image,width=423,height=534]
566+
image:images/SystemStructureCommon_Signature.png[image,width=423,height=419]
554567

555568
This element specifies digital signature information on the data or meta data referenced by the enclosing element:
556569
If the Signature element is contained within a MetaData element, it refers to the meta data referenced by the MetaData element.

docs/5___ssd.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ All SSD-specific elements live in the `http://ssp-standard.org/SSP1/SystemStruct
88

99
=== SystemStructureDescription
1010

11-
image:images/image23.png[image,width=464,height=506]
11+
image:images/SystemStructureDescription_SystemStructureDescription.png[image,width=475,height=693]
1212

1313
The root element of an SSD file *MUST* be a SystemStructureDescription element, which gives overall information about the system hierarchy described in this SSD file, including common meta-data, and acts as a bracket for the root system and its unit and enumeration definitions.
1414

@@ -64,7 +64,7 @@ _This standard does not specify additional measures to deal with differing indep
6464

6565
System, Component and SignalDictionaryReference XML elements are subtypes of a common TElement base type, that contains attributes and XML elements common to all kinds of model elements:
6666

67-
image:images/image25.png[image,width=379,height=280]
67+
image:images/SystemStructureDescription_TElement.png[image,width=391,height=466]
6868

6969
The following XML attributes are specified for the TElement type:
7070

@@ -367,7 +367,7 @@ image:images/IconExample15.png[image,width=245,height=147]
367367

368368
==== ParameterBindings
369369

370-
image:images/image32.png[image,width=646,height=470]
370+
image:images/SystemStructureDescription_ParameterBindings.png[image,width=746,height=719]
371371

372372
The ParameterBindings element provides the parameter bindings for a component or system, where each binding is specified in a ParameterBinding element.
373373
A parameter binding applies a set of parameter values (a parameter set), supplied by a parameter source (for example a parameter file) to parametrize a component or system.
@@ -468,7 +468,7 @@ In that case there *SHOULD* be a layered specification that defines how embeddin
468468

469469
===== ParameterMapping
470470

471-
image:images/image34.png[image,width=441,height=355]
471+
image:images/SystemStructureDescription_ParameterMapping.png[image,width=473,height=541]
472472

473473
This element provides a parameter mapping, which specifies how the parameter names and values provided in the parameter source are to be mapped to the parameters of the component or system in question.
474474
If no mapping is supplied, the parameter names of the parameter source are used as is for name matching against the names of parameters in the component or system and the values of the parameter source are not transformed further before being applied.
@@ -499,7 +499,7 @@ In that case there *SHOULD* be a layered specification that defines how embeddin
499499

500500
=== System
501501

502-
image:images/image35.png[image,width=452,height=641]
502+
image:images/SystemStructureDescription_System.png[image,width=463,height=827]
503503

504504
This element describes a system, which can contain components, signal dictionary references and other systems as elements, connectors as an interface to the outside world, and connections connecting the connectors of itself and of its elements to one another.
505505

@@ -687,7 +687,7 @@ image:images/image40.png[image,width=427,height=82]
687687

688688
This optional element provides the set of defined signal dictionaries for the system.
689689

690-
image:images/image41.png[image,width=415,height=336]
690+
image:images/SystemStructureDescription_SignalDictionary.png[image,width=447,height=522]
691691

692692
A signal dictionary is a collection of signals which can be accessed in different systems at different levels of the hierarchy through signal dictionary references referencing the signal dictionary.
693693

@@ -796,7 +796,7 @@ Inside the text attribute, newlines indicate paragraph breaks.
796796

797797
=== Component
798798

799-
image:images/image45.png[image,width=470,height=588]
799+
image:images/SystemStructureDescription_Component.png[image,width=481,height=879]
800800

801801
A component is an atomic element of a system (i.e. its internal structure is not specified).
802802

@@ -840,7 +840,7 @@ It is an error if the specified type of FMU implementation is not present in the
840840

841841
=== SignalDictionaryReference
842842

843-
image:images/image46.png[image,width=544,height=442]
843+
image:images/SystemStructureDescription_SignalDictionaryReference.png[image,width=555,height=733]
844844

845845
A signal dictionary reference is an element of a system that references a signal dictionary, i.e. it is the place-holder of the signal dictionary that allows access to the contents of the signal dictionary through its connectors, which *MUST* reference signal dictionary entries.
846846

docs/6___ssv.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Except for this file extension recommendation the filename is arbitrary and is i
1414

1515
=== ParameterSet
1616

17-
image:images/SystemStructureParameterValues_ParameterSet.png[image,width=405,height=574]
17+
image:images/SystemStructureParameterValues_ParameterSet.png[image,width=405,height=639]
1818

1919
The ParameterSet element contains parameter and meta data information.
2020
If the SSV is provided as a separate file, the root element *MUST* be a ParameterSet element.

docs/7___ssm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The root element of an SSM file *MUST* be a ParameterMapping element, which cont
1717

1818
=== ParameterMapping
1919

20-
image:images/SystemStructureParameterMapping_ParameterMapping.png[image,width=450,height=412]
20+
image:images/SystemStructureParameterMapping_ParameterMapping.png[image,width=450,height=477]
2121

2222
This element describes a parameter mapping, which consists of multiple mapping entries, each describing one parameter mapping (see next section).
2323
The parameter mapping *MUST* contain entries for all parameters that are going to be mapped.

docs/8___ssb.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Any enumerations or units used in the DictionaryEntry elements *MUST* be declare
1616

1717
=== SignalDictionary
1818

19-
image:images/SystemStructureSignalDictionary_SignalDictionary.png[image,width=438,height=520]
19+
image:images/SystemStructureSignalDictionary_SignalDictionary.png[image,width=438,height=585]
2020

2121
This element describes a signal dictionary, which consists of one or more dictionary entries, each describing one signal in the signal dictionary (see next section).
2222

-3.88 KB
Loading
1.06 KB
Loading
8.82 KB
Loading
-272 Bytes
Loading
-4.74 KB
Loading

0 commit comments

Comments
 (0)