Redesigned ICL working

Author: JimLuth

NodeSetToAML.cs

@@ -76,6 +76,8 @@ public class NodeSetToAML
         private const string MetaModelName = "OpcAmlMetaModel";
         private const string UaBaseRole = "UaBaseRole";
         private const string MethodNodeClass = "UaMethodNodeClass";
+        private const string RefClassConnectsToPath = "RefClassConnectsToPath";
+        private const string IsSource = "IsSource";
         private ModelManager m_modelManager;
         private CAEXDocument m_cAEXDocument;
         private AttributeTypeLibType m_atl_temp;
@@ -798,9 +800,30 @@ SystemUnitFamilyType FindOrAddSUC(ref SystemUnitClassLibType scl, ref RoleClassL
 
         #endregion
 
-     
+
         #region ICL
 
+        private void OverrideAttribute(IClassWithBaseClassReference owner, string Name, string AttType, object val)
+        {
+            var atts = owner.GetInheritedAttributes();
+            foreach(var aa in atts)
+            {
+                if (aa.Name == Name)
+                {
+                    if (aa.AttributeDataType == AttType && aa.AttributeValue.Equals(val))
+                    {
+                        return;  // no need to override
+                    }
+                }
+            }
+
+            AttributeType a = owner.Attribute.Append();
+            a.Name = Name;
+            a.AttributeDataType = AttType;
+            a.AttributeValue = val;
+       
+        }
+
         private void ProcesReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
         {
             var refnode = m_modelManager.FindNode<NodeSet.UAReferenceType>(nodeId);
@@ -834,7 +857,7 @@ private void ProcesReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
                 }
             }
 
-
+            
             // ovveride any attribute values
             if (BaseNodeId != null)
             {
@@ -847,6 +870,12 @@ private void ProcesReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
 
                 if (refnode.InverseName != null)
                     AddModifyAttribute( true, added.Attribute, "InverseName", "LocalizedText",  refnode.InverseName[0].Value);
+                
+                OverrideAttribute(added, IsSource, "xs:boolean", true);
+                OverrideAttribute(added, RefClassConnectsToPath, "xs:string", (inverseAdded != null ? inverseAdded.CAEXPath() : added.CAEXPath()));
+
+                
+
 
                 if (inverseAdded != null)
                 {
@@ -856,6 +885,9 @@ private void ProcesReferenceType(ref InterfaceClassLibType icl, NodeId nodeId)
                     if (basenode.Symmetric != refnode.Symmetric)
                         OverrideBooleanAttribute(inverseAdded.Attribute, "Symmetric", refnode.Symmetric);
                     AddModifyAttribute( true, inverseAdded.Attribute, "InverseName", "LocalizedText", refnode.DecodedBrowseName.Name);
+                    // OverrideBooleanAttribute(inverseAdded.Attribute, "IsSource", false);
+                    OverrideAttribute(inverseAdded, IsSource, "xs:boolean", false);
+                    OverrideAttribute(inverseAdded, RefClassConnectsToPath, "xs:string",  added.CAEXPath());
 
                 }
 

Opc2Aml.csproj

@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aml.Engine" Version="1.7.0" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.367.42" />
+    <PackageReference Include="Aml.Engine" Version="1.7.2" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.367.75" />
   </ItemGroup>
 
   <ItemGroup>