haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CADSTAR Sch: TERMATTR may have more than one attribute subnode 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/13526


(cherry picked from commit fc04f5135f)
This commit is contained in:
Roberto Fernandez Bautista 2023-03-26 15:54:21 +01:00
parent 8b1ce36402
commit 97c018118d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/sch_plugins/cadstar/cadstar_sch_archive_parser.cpp
View File

@ -551,14 +551,14 @@ void CADSTAR_SCH_ARCHIVE_PARSER::TERMATTR::Parse( XNODE* aNode, PARSER_CONTEXT*
TerminalID = GetXmlAttributeIDLong( aNode, 0 ); TerminalID = GetXmlAttributeIDLong( aNode, 0 );
XNODE* cNode = aNode->GetChildren(); XNODE* cNode = aNode->GetChildren();
bool attrParsed = false;
for( ; cNode; cNode = cNode->GetNext() ) for( ; cNode; cNode = cNode->GetNext() )
{ {
if( !attrParsed && cNode->GetName() == wxT( "ATTR" ) ) if( cNode->GetName() == wxT( "ATTR" ) )
{ {
Value.Parse( cNode, aContext ); ATTRIBUTE_VALUE val;
attrParsed = true; val.Parse( cNode, aContext );
Attributes.push_back( val );
} }
else else
{ {

4
eeschema/sch_plugins/cadstar/cadstar_sch_archive_parser.h
View File

@ -206,8 +206,8 @@ public:
struct TERMATTR : PARSER struct TERMATTR : PARSER
{ {
TERMINAL_ID TerminalID; TERMINAL_ID TerminalID;
ATTRIBUTE_VALUE Value; std::vector<ATTRIBUTE_VALUE> Attributes;
void Parse( XNODE* aNode, PARSER_CONTEXT* aContext ) override; void Parse( XNODE* aNode, PARSER_CONTEXT* aContext ) override;
}; };