Skip to content

IsAbstract removed from OptionSetFieldDefinitions and EnumFieldDefini… #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Archie-Miller merged 1 commit into from
Sep 19, 2025
Merged

IsAbstract removed from OptionSetFieldDefinitions and EnumFieldDefini… #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions NodeSetToAML.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3168,7 +3168,7 @@ private void AddAttributeData( AttributeFamilyType attribute, UANode uaNode )

AddEnumerationFieldDefinition( attribute, uaNode );

AddOptionSetFieldDefintion( attribute, uaNode );
AddOptionSetFieldDefinition( attribute, uaNode );

AttributeType nodeIdAttribute = AddModifyAttribute( attribute.Attribute,"NodeId", "NodeId",
new Variant( uaNode.DecodedNodeId ) );
Expand Down Expand Up @@ -3392,7 +3392,7 @@ private void AddEnumerationFieldDefinition(AttributeFamilyType attribute, UANode
{
AttributeType fieldAttribute = new AttributeType(new System.Xml.Linq.XElement(defaultNS + "Attribute"));

fieldAttribute.RecreateAttributeInstance(enumFieldSource);
RecreateAttributeInstance(enumFieldSource, fieldAttribute);
fieldAttribute.Name = fieldDefinition.Name;

// Remove the Name
Expand All @@ -3418,7 +3418,7 @@ private void AddEnumerationFieldDefinition(AttributeFamilyType attribute, UANode
}
}

private void AddOptionSetFieldDefintion( AttributeFamilyType attribute, UANode uaNode )
private void AddOptionSetFieldDefinition( AttributeFamilyType attribute, UANode uaNode )
{
UADataType optionSetNode = uaNode as UADataType;
if (optionSetNode != null &&
Expand All @@ -3434,7 +3434,7 @@ private void AddOptionSetFieldDefintion( AttributeFamilyType attribute, UANode u
AttributeType optionSetFields = new AttributeType(
new System.Xml.Linq.XElement(defaultNS + "Attribute"));

optionSetFields.RecreateAttributeInstance(optionSetFieldDefinition as AttributeFamilyType);
optionSetFields.RecreateAttributeInstance(optionSetFieldDefinition);
optionSetFields.Name = "OptionSetFieldDefinition";
optionSetFields.AdditionalInformation.Append(OpcUaTypeOnly);

Expand All @@ -3452,6 +3452,7 @@ private void AddOptionSetFieldDefintion( AttributeFamilyType attribute, UANode u
"Value", "Int32", new Variant(fieldDefinition.Value));

RemoveUnwantedAttribute(valueAttribute, "NodeId");
RemoveUnwantedAttribute(fieldAttribute, "IsAbstract");
RemoveUnwantedAttribute(fieldAttribute, "ValidBits");
RemoveUnwantedAttribute(fieldAttribute, "NodeId");

Expand Down
1 change: 1 addition & 0 deletions SystemTest/TestEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ public void TestFieldDefinition(uint nodeId, object enumObject)

foreach (AttributeType fieldDefinition in enumFieldDefinition.Attribute)
{
Assert.IsNull(fieldDefinition.Attribute["IsAbstract"]);
AttributeType valueAttribute = fieldDefinition.Attribute["Value"];
Assert.IsNotNull(valueAttribute, "Field Definition Value is null");
Assert.IsNotNull(valueAttribute.Value, "Field Definition Value-Value is null");
Expand Down
1 change: 1 addition & 0 deletions SystemTest/TestOptionSetEmptyValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ public void TestFieldDefinitions(string attributeName, string attributeValue)
AttributeType attribute = GetAttribute(fieldDefinition, attributeName);

Assert.IsNull(attribute.Attribute["NodeId"]);
Assert.IsNull(attribute.Attribute["IsAbstract"]);
AttributeType valueAttribute = GetAttribute(attribute, "Value");
Assert.AreEqual( valueAttribute.Value, attributeValue);

Expand Down