From dcef9a20f5c011dba0d13b4b82127549f0305dc7 Mon Sep 17 00:00:00 2001 From: Michael Hoffmeister Date: Sun, 3 Mar 2024 09:10:47 +0100 Subject: [PATCH] * after refactor of predefined concepts --- .../Table/ExportTableProcessor.cs | 2 +- src/AasxPluginExportTable/Uml/BaseWriter.cs | 2 +- .../{ => BaseTopUtil}/AasxDefinitionBase.cs | 0 .../{ => BaseTopUtil}/DefinitionsPool.cs | 0 .../ExportPredefinedConcepts.cs | 0 .../PredefinedConceptsClassMapper.cs | 0 .../{ => Definitions}/DefinitionsAasEvents.cs | 0 .../{ => Definitions}/DefinitionsAsciiDoc.cs | 0 .../DefinitionsDigitalNameplateV20.cs | 0 .../DefinitionsExperimental.cs | 0 .../DefinitionsIdtaContactInformationV10.cs | 0 ...DefinitionsIdtaHandoverDocumentationV12.cs | 0 ...efinitionsIdtaHierarchicalStructuresV10.cs | 0 .../DefinitionsIdtaTechnicalDataV12.cs | 0 .../{ => Definitions}/DefinitionsImageMap.cs | 0 .../{ => Definitions}/DefinitionsLanguages.cs | 0 .../{ => Definitions}/DefinitionsMTP.cs | 0 .../DefinitionsPackageExplorer.cs | 0 .../{ => Definitions}/DefinitionsPlotting.cs | 0 .../DefinitionsSmdExporter.cs | 0 .../DefinitionsSmtAdditions.cs | 0 .../{ => Definitions}/DefinitionsV2770v11.cs | 0 .../{ => Definitions}/DefinitionsVDI2770.cs | 0 .../DefinitionsZveiDigitalTypeplate.cs | 0 .../DefinitionsZveiNameplateV10.cs | 0 .../DefinitionsZveiTechnicalData.cs | 0 .../DefinitionsZveiTechnicalDataV11.cs | 0 .../DefinitionsZveiTimeSeriesDataV10.cs | 0 .../MappingsAssetInterfacesDescription.cs | 0 .../MappingsAssetInterfacesMapping.cs | 0 .../MappingsProductChangeNotifications.cs | 0 .../{ => Qualifiers}/QualifiersSmt.cs | 84 +++++++++---------- src/AasxPredefinedConcepts/README/Overview.md | 25 +++++- 33 files changed, 68 insertions(+), 45 deletions(-) rename src/AasxPredefinedConcepts/{ => BaseTopUtil}/AasxDefinitionBase.cs (100%) rename src/AasxPredefinedConcepts/{ => BaseTopUtil}/DefinitionsPool.cs (100%) rename src/AasxPredefinedConcepts/{ => BaseTopUtil}/ExportPredefinedConcepts.cs (100%) rename src/AasxPredefinedConcepts/{ => BaseTopUtil}/PredefinedConceptsClassMapper.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsAasEvents.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsAsciiDoc.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsDigitalNameplateV20.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsExperimental.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsIdtaContactInformationV10.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsIdtaHandoverDocumentationV12.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsIdtaHierarchicalStructuresV10.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsIdtaTechnicalDataV12.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsImageMap.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsLanguages.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsMTP.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsPackageExplorer.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsPlotting.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsSmdExporter.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsSmtAdditions.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsV2770v11.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsVDI2770.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsZveiDigitalTypeplate.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsZveiNameplateV10.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsZveiTechnicalData.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsZveiTechnicalDataV11.cs (100%) rename src/AasxPredefinedConcepts/{ => Definitions}/DefinitionsZveiTimeSeriesDataV10.cs (100%) rename src/AasxPredefinedConcepts/{ => Mappings}/MappingsAssetInterfacesDescription.cs (100%) rename src/AasxPredefinedConcepts/{ => Mappings}/MappingsAssetInterfacesMapping.cs (100%) rename src/AasxPredefinedConcepts/{ => Mappings}/MappingsProductChangeNotifications.cs (100%) rename src/AasxPredefinedConcepts/{ => Qualifiers}/QualifiersSmt.cs (78%) diff --git a/src/AasxPluginExportTable/Table/ExportTableProcessor.cs b/src/AasxPluginExportTable/Table/ExportTableProcessor.cs index 068473c6..5cb11496 100644 --- a/src/AasxPluginExportTable/Table/ExportTableProcessor.cs +++ b/src/AasxPluginExportTable/Table/ExportTableProcessor.cs @@ -25,7 +25,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using System.Text.RegularExpressions; using System.Windows.Media; using Aas = AasCore.Aas3_0; -using AasxPredefinedConcepts; +using AasxPredefinedConcepts.Qualifiers; // ReSharper disable PossiblyMistakenUseOfParamsMethod .. issue, even if according to samples of Word API diff --git a/src/AasxPluginExportTable/Uml/BaseWriter.cs b/src/AasxPluginExportTable/Uml/BaseWriter.cs index b41c6552..1b68f83f 100644 --- a/src/AasxPluginExportTable/Uml/BaseWriter.cs +++ b/src/AasxPluginExportTable/Uml/BaseWriter.cs @@ -24,7 +24,7 @@ This source code may use other Open Source software components (see LICENSE.txt) using Aas = AasCore.Aas3_0; using AdminShellNS; using Extensions; -using AasxPredefinedConcepts; +using AasxPredefinedConcepts.Qualifiers; namespace AasxPluginExportTable.Uml { diff --git a/src/AasxPredefinedConcepts/AasxDefinitionBase.cs b/src/AasxPredefinedConcepts/BaseTopUtil/AasxDefinitionBase.cs similarity index 100% rename from src/AasxPredefinedConcepts/AasxDefinitionBase.cs rename to src/AasxPredefinedConcepts/BaseTopUtil/AasxDefinitionBase.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsPool.cs b/src/AasxPredefinedConcepts/BaseTopUtil/DefinitionsPool.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsPool.cs rename to src/AasxPredefinedConcepts/BaseTopUtil/DefinitionsPool.cs diff --git a/src/AasxPredefinedConcepts/ExportPredefinedConcepts.cs b/src/AasxPredefinedConcepts/BaseTopUtil/ExportPredefinedConcepts.cs similarity index 100% rename from src/AasxPredefinedConcepts/ExportPredefinedConcepts.cs rename to src/AasxPredefinedConcepts/BaseTopUtil/ExportPredefinedConcepts.cs diff --git a/src/AasxPredefinedConcepts/PredefinedConceptsClassMapper.cs b/src/AasxPredefinedConcepts/BaseTopUtil/PredefinedConceptsClassMapper.cs similarity index 100% rename from src/AasxPredefinedConcepts/PredefinedConceptsClassMapper.cs rename to src/AasxPredefinedConcepts/BaseTopUtil/PredefinedConceptsClassMapper.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsAasEvents.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsAasEvents.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsAasEvents.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsAasEvents.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsAsciiDoc.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsAsciiDoc.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsAsciiDoc.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsAsciiDoc.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsDigitalNameplateV20.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsDigitalNameplateV20.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsDigitalNameplateV20.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsDigitalNameplateV20.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsExperimental.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsExperimental.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsExperimental.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsExperimental.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsIdtaContactInformationV10.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaContactInformationV10.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsIdtaContactInformationV10.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaContactInformationV10.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsIdtaHandoverDocumentationV12.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaHandoverDocumentationV12.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsIdtaHandoverDocumentationV12.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaHandoverDocumentationV12.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsIdtaHierarchicalStructuresV10.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaHierarchicalStructuresV10.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsIdtaHierarchicalStructuresV10.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaHierarchicalStructuresV10.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsIdtaTechnicalDataV12.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaTechnicalDataV12.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsIdtaTechnicalDataV12.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsIdtaTechnicalDataV12.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsImageMap.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsImageMap.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsImageMap.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsImageMap.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsLanguages.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsLanguages.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsLanguages.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsLanguages.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsMTP.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsMTP.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsMTP.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsMTP.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsPackageExplorer.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsPackageExplorer.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsPackageExplorer.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsPackageExplorer.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsPlotting.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsPlotting.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsPlotting.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsPlotting.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsSmdExporter.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsSmdExporter.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsSmdExporter.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsSmdExporter.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsSmtAdditions.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsSmtAdditions.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsSmtAdditions.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsSmtAdditions.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsV2770v11.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsV2770v11.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsV2770v11.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsV2770v11.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsVDI2770.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsVDI2770.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsVDI2770.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsVDI2770.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsZveiDigitalTypeplate.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsZveiDigitalTypeplate.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsZveiDigitalTypeplate.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsZveiDigitalTypeplate.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsZveiNameplateV10.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsZveiNameplateV10.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsZveiNameplateV10.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsZveiNameplateV10.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsZveiTechnicalData.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsZveiTechnicalData.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsZveiTechnicalData.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsZveiTechnicalData.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsZveiTechnicalDataV11.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsZveiTechnicalDataV11.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsZveiTechnicalDataV11.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsZveiTechnicalDataV11.cs diff --git a/src/AasxPredefinedConcepts/DefinitionsZveiTimeSeriesDataV10.cs b/src/AasxPredefinedConcepts/Definitions/DefinitionsZveiTimeSeriesDataV10.cs similarity index 100% rename from src/AasxPredefinedConcepts/DefinitionsZveiTimeSeriesDataV10.cs rename to src/AasxPredefinedConcepts/Definitions/DefinitionsZveiTimeSeriesDataV10.cs diff --git a/src/AasxPredefinedConcepts/MappingsAssetInterfacesDescription.cs b/src/AasxPredefinedConcepts/Mappings/MappingsAssetInterfacesDescription.cs similarity index 100% rename from src/AasxPredefinedConcepts/MappingsAssetInterfacesDescription.cs rename to src/AasxPredefinedConcepts/Mappings/MappingsAssetInterfacesDescription.cs diff --git a/src/AasxPredefinedConcepts/MappingsAssetInterfacesMapping.cs b/src/AasxPredefinedConcepts/Mappings/MappingsAssetInterfacesMapping.cs similarity index 100% rename from src/AasxPredefinedConcepts/MappingsAssetInterfacesMapping.cs rename to src/AasxPredefinedConcepts/Mappings/MappingsAssetInterfacesMapping.cs diff --git a/src/AasxPredefinedConcepts/MappingsProductChangeNotifications.cs b/src/AasxPredefinedConcepts/Mappings/MappingsProductChangeNotifications.cs similarity index 100% rename from src/AasxPredefinedConcepts/MappingsProductChangeNotifications.cs rename to src/AasxPredefinedConcepts/Mappings/MappingsProductChangeNotifications.cs diff --git a/src/AasxPredefinedConcepts/QualifiersSmt.cs b/src/AasxPredefinedConcepts/Qualifiers/QualifiersSmt.cs similarity index 78% rename from src/AasxPredefinedConcepts/QualifiersSmt.cs rename to src/AasxPredefinedConcepts/Qualifiers/QualifiersSmt.cs index 2b5c05f7..36fa271d 100644 --- a/src/AasxPredefinedConcepts/QualifiersSmt.cs +++ b/src/AasxPredefinedConcepts/Qualifiers/QualifiersSmt.cs @@ -21,7 +21,7 @@ This source code may use other Open Source software components (see LICENSE.txt) // reSharper disable UnusedType.Global // reSharper disable ClassNeverInstantiated.Global -namespace AasxPredefinedConcepts +namespace AasxPredefinedConcepts.Qualifiers { /// /// This class provides handles specific qualifiers, extensions @@ -64,105 +64,105 @@ public enum AccessMode ReadOnly }; - public static Aas.IQualifier CreateQualifierSmtCardinality(SmtCardinality card) + public static IQualifier CreateQualifierSmtCardinality(SmtCardinality card) { - return new Aas.Qualifier( + return new Qualifier( type: "SMT/Cardinality", valueType: DataTypeDefXsd.String, kind: QualifierKind.TemplateQualifier, - semanticId: new Aas.Reference(ReferenceTypes.ExternalReference, - (new Aas.IKey[] { - new Aas.Key(KeyTypes.GlobalReference, + semanticId: new Reference(ReferenceTypes.ExternalReference, + (new IKey[] { + new Key(KeyTypes.GlobalReference, "https://admin-shell.io/SubmodelTemplates/Cardinality/1/0") }).ToList()), value: "" + card); } - public static Aas.IQualifier CreateQualifierSmtAllowedValue(string regex) + public static IQualifier CreateQualifierSmtAllowedValue(string regex) { - return new Aas.Qualifier( + return new Qualifier( type: "SMT/AllowedValue", valueType: DataTypeDefXsd.String, kind: QualifierKind.TemplateQualifier, - semanticId: new Aas.Reference(ReferenceTypes.ExternalReference, - (new Aas.IKey[] { - new Aas.Key(KeyTypes.GlobalReference, + semanticId: new Reference(ReferenceTypes.ExternalReference, + (new IKey[] { + new Key(KeyTypes.GlobalReference, "https://admin-shell.io/SubmodelTemplates/AllowedValue/1/0") }).ToList()), value: "" + regex); } - public static Aas.IQualifier CreateQualifierSmtExampleValue(string exampleValue) + public static IQualifier CreateQualifierSmtExampleValue(string exampleValue) { - return new Aas.Qualifier( + return new Qualifier( type: "SMT/ExampleValue", valueType: DataTypeDefXsd.String, kind: QualifierKind.TemplateQualifier, - semanticId: new Aas.Reference(ReferenceTypes.ExternalReference, - (new Aas.IKey[] { - new Aas.Key(KeyTypes.GlobalReference, + semanticId: new Reference(ReferenceTypes.ExternalReference, + (new IKey[] { + new Key(KeyTypes.GlobalReference, "https://admin-shell.io/SubmodelTemplates/ExampleValue/1/0") }).ToList()), value: "" + exampleValue); } - public static Aas.IQualifier CreateQualifierSmtDefaultValue(string defaultValue) + public static IQualifier CreateQualifierSmtDefaultValue(string defaultValue) { - return new Aas.Qualifier( + return new Qualifier( type: "SMT/DefaultValue", valueType: DataTypeDefXsd.String, kind: QualifierKind.TemplateQualifier, - semanticId: new Aas.Reference(ReferenceTypes.ExternalReference, - (new Aas.IKey[] { - new Aas.Key(KeyTypes.GlobalReference, + semanticId: new Reference(ReferenceTypes.ExternalReference, + (new IKey[] { + new Key(KeyTypes.GlobalReference, "https://admin-shell.io/SubmodelTemplates/DefaultValue/1/0") }).ToList()), value: "" + defaultValue); } - public static Aas.IQualifier CreateQualifierSmtEitherOr(string equivalencyClass) + public static IQualifier CreateQualifierSmtEitherOr(string equivalencyClass) { - return new Aas.Qualifier( + return new Qualifier( type: "SMT/EitherOr", valueType: DataTypeDefXsd.String, kind: QualifierKind.TemplateQualifier, - semanticId: new Aas.Reference(ReferenceTypes.ExternalReference, - (new Aas.IKey[] { - new Aas.Key(KeyTypes.GlobalReference, + semanticId: new Reference(ReferenceTypes.ExternalReference, + (new IKey[] { + new Key(KeyTypes.GlobalReference, "https://admin-shell.io/SubmodelTemplates/Cardinality/1/0") }).ToList()), value: "" + equivalencyClass); } - public static Aas.IQualifier CreateQualifierSmtRequiredLang(string reqLang) + public static IQualifier CreateQualifierSmtRequiredLang(string reqLang) { - return new Aas.Qualifier( + return new Qualifier( type: "SMT/RequiredLang", valueType: DataTypeDefXsd.String, kind: QualifierKind.TemplateQualifier, - semanticId: new Aas.Reference(ReferenceTypes.ExternalReference, - (new Aas.IKey[] { - new Aas.Key(KeyTypes.GlobalReference, + semanticId: new Reference(ReferenceTypes.ExternalReference, + (new IKey[] { + new Key(KeyTypes.GlobalReference, "https://admin-shell.io/SubmodelTemplates/RequiredLang/1/0") }).ToList()), value: "" + reqLang); } - public static Aas.IQualifier CreateQualifierSmtAccessMode(AccessMode mode) + public static IQualifier CreateQualifierSmtAccessMode(AccessMode mode) { - return new Aas.Qualifier( + return new Qualifier( type: "SMT/AccessMode", valueType: DataTypeDefXsd.String, kind: QualifierKind.TemplateQualifier, - semanticId: new Aas.Reference(ReferenceTypes.ExternalReference, - (new Aas.IKey[] { - new Aas.Key(KeyTypes.GlobalReference, + semanticId: new Reference(ReferenceTypes.ExternalReference, + (new IKey[] { + new Key(KeyTypes.GlobalReference, "https://admin-shell.io/SubmodelTemplates/AccessMode/1/0") }).ToList()), value: "" + mode); } - public static Aas.IQualifier[] AllSmtQualifiers = + public static IQualifier[] AllSmtQualifiers = { CreateQualifierSmtCardinality(SmtCardinality.One), CreateQualifierSmtAllowedValue(""), @@ -177,11 +177,11 @@ public static Aas.IQualifier CreateQualifierSmtAccessMode(AccessMode mode) /// Find either type or semanticId and returns the link /// to a STATIC IQualifier (not to be changed!). /// - public static Aas.IQualifier FindQualifierTypeInst( - string type, Aas.IReference semanticId, bool relaxed = true) + public static IQualifier FindQualifierTypeInst( + string type, IReference semanticId, bool relaxed = true) { // at best: tries to find semanticId - Aas.IQualifier res = null; + IQualifier res = null; foreach (var qti in AllSmtQualifiers) if (semanticId?.IsValid() == true && semanticId.Matches(qti.SemanticId, MatchMode.Relaxed)) res = qti; @@ -210,7 +210,7 @@ public static Aas.IQualifier FindQualifierTypeInst( /// /// Ask for different Qualifier names for cardinality and give a match back. /// - public static Aas.IQualifier FindSmtCardinalityQualfier(IEnumerable qualifiers) + public static IQualifier FindSmtCardinalityQualfier(IEnumerable qualifiers) { // TODO (MIHO, 2024-02-20): In future, check semanticIds as well? @@ -234,7 +234,7 @@ public static string CardinalityToString(SmtCardinality card, int format = 0, if (p >= 0) multiStr = multiStr.Substring(p).Trim('[', ']'); #else - switch (card) + switch (card) { case SmtCardinality.ZeroToOne: switch (format) diff --git a/src/AasxPredefinedConcepts/README/Overview.md b/src/AasxPredefinedConcepts/README/Overview.md index d26e15ae..1bbf1034 100644 --- a/src/AasxPredefinedConcepts/README/Overview.md +++ b/src/AasxPredefinedConcepts/README/Overview.md @@ -7,7 +7,18 @@ semanticIds and class structures. These concepts could be used on *source code level* to avoid having semanticIds as sttring constants. Nearly everything here was produced by the export function: -AASPE / File / Export / Export predefined concepts +AASPE / File / Export / Export predefined concepts. + +Multiple low level SDK function are designed for using these symbols, e.g. + +``` +foreach (var srcLst in this.theSubmodel.SubmodelElements + .FindAllSemanticIdAs( + this.defsMtp.CD_SourceList?.GetReference(), MatchMode.Relaxed)) +{ + ... +} +``` ## Programmers note @@ -19,6 +30,18 @@ However, when using "Add predefined .." button in References dialogue, the user has to wait some 8sec for the first results, as *ALL* classes are firstly instantiated for this scan. +## Namespaces + +Currently, the folder names do not influence the namespaces of the classes, because +handling would even get longer. + +## BaseTopUtil + +These classes are either base classes, utility functions or the root definitions, +where all others are linked to. + +Note: New definition classes shall be linked within `DefinitionsPool.cs`. + ## Concept model (Deprecated) approach to provide a switcher between different sets of concepts,