Bug fixes.

digitaltwinconsortium · Oct 20, 2024 · 479c43c · 479c43c
1 parent a881fb1
commit 479c43c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/OPCUAViewer/I4AASNodeManager.cs b/src/OPCUAViewer/I4AASNodeManager.cs
@@ -375,7 +375,7 @@ public NodeState CreateObject(NodeState parent, AssetAdministrationShellEnvironm
             CreateVariable<string>(o, "Identification", c_identifiableTypeNodeId, aas.Id);
             CreateVariable<string>(o, "Administration", c_administrationNodeId, aas.Administration?.ToString());
 
-            if (aas.EmbeddedDataSpecifications != null && aas.EmbeddedDataSpecifications != null)
+            if (aas.EmbeddedDataSpecifications != null)
             {
                 foreach (var ds in aas.EmbeddedDataSpecifications)
                 {
@@ -392,9 +392,9 @@ public NodeState CreateObject(NodeState parent, AssetAdministrationShellEnvironm
 
             if (aas.Submodels != null && aas.Submodels.Count > 0)
             {
-                foreach (var smr in aas.Submodels)
+                for (int i = 0; i < aas.Submodels.Count; i++)
                 {
-                    CreateVariable<string>(o, "Submodel", c_submodelNodeId, smr.ToString());
+                    CreateVariable<string>(o, "Submodel_" + i.ToString(), c_submodelNodeId, aas.Submodels[i].Keys[0].Value);
                 }
             }