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

Correctly increment field IDs 

Setting to -1 is no longer valid despite the previous comment as this
will pick out a single non-mandatory field to save

Fixes https://gitlab.com/kicad/code/kicad/issues/12567
This commit is contained in:
Seth Hillbrand 2022-10-03 21:49:37 -07:00
parent fb8a4c10f7
commit f5f6d44a48
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
View File

@ -2513,6 +2513,7 @@ SCH_SYMBOL* SCH_SEXPR_PARSER::parseSchematicSymbol()
symbol->ClearFieldsAutoplaced();
m_fieldId = MANDATORY_FIELDS;
m_fieldIDsRead.clear();
for( token = NextTok(); token != T_RIGHT; token = NextTok() )
{
@ -2763,17 +2764,15 @@ SCH_SYMBOL* SCH_SEXPR_PARSER::parseSchematicSymbol()
// the field positions are set.
field = parseSchField( symbol.get() );
// It would appear that at some point we allowed duplicate ids to slip through
// when writing files. The easiest (and most complete) solution is to disallow
// multiple instances of the same id (for all files since the source of the error
// *might* in fact be hand-edited files).
//
// While no longer used, -1 is still a valid id for user field. It gets converted
// to the next unused number on save.
if( fieldIDsRead.count( field->GetId() ) )
field->SetId( -1 );
else
fieldIDsRead.insert( field->GetId() );
if( m_fieldIDsRead.count( field->GetId() ) )
{
int nextAvailableId = field->GetId() + 1;
while( m_fieldIDsRead.count( nextAvailableId ) )
nextAvailableId += 1;
field->SetId( nextAvailableId );
}
// Set the default symbol reference prefix.
if( field->GetId() == REFERENCE_FIELD )
@ -2807,6 +2806,8 @@ SCH_SYMBOL* SCH_SEXPR_PARSER::parseSchematicSymbol()
else
symbol->AddField( *field );
m_fieldIDsRead.insert( field->GetId() );
delete field;
break;