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

Fix issue with duplicate field IDs getting saved out. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4821
This commit is contained in:
Jeff Young 2020-07-14 15:59:07 +01:00
parent 55f4c2b167
commit 1dc804232c
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/sch_file_versions.h
View File

@ -49,4 +49,6 @@
//#define SEXPR_SCHEMATIC_FILE_VERSION 20200608 // Add support for bus and junction properties. //#define SEXPR_SCHEMATIC_FILE_VERSION 20200608 // Add support for bus and junction properties.
#define SEXPR_SCHEMATIC_FILE_VERSION 20200618 //#define SEXPR_SCHEMATIC_FILE_VERSION 20200618 // Disallow duplicate field ids.
#define SEXPR_SCHEMATIC_FILE_VERSION 20200714

37
eeschema/sch_sexpr_parser.cpp
View File

@ -2166,6 +2166,25 @@ SCH_COMPONENT* SCH_SEXPR_PARSER::parseSchematicSymbol()
// the field positions are set. // the field positions are set.
field = parseSchField( symbol.get() ); field = parseSchField( symbol.get() );
if( m_requiredVersion <= 20200618 )
{
// It would appear that at some point we allowed duplicate ids to slip
// through when writing files. We know this happens at least for sheets,
// so we add the patch for it here too (even though we don't know for
// sure if it's necessary).
//
// While no longer used, -1 is still a valid id for user fields and will
// get written out as the next unused number on save.
for( const SCH_FIELD& existing : symbol->GetFields() )
{
if( existing.GetId() == field->GetId() )
{
field->SetId( -1 );
break;
}
}
}
// Set the default symbol reference prefix. // Set the default symbol reference prefix.
if( field->GetId() == REFERENCE ) if( field->GetId() == REFERENCE )
{ {
@ -2353,6 +2372,24 @@ SCH_SHEET* SCH_SEXPR_PARSER::parseSheet()
field->SetId( SHEETFILENAME ); field->SetId( SHEETFILENAME );
} }
if( m_requiredVersion <= 20200618 )
{
// It would appear the problem persists past 20200310, but this time with
// the earlier ids being re-used for later (user) fields. The easiest (and
// most complete) solution is to disallow multiple instances of the same id.
//
// While no longer used, -1 is still a valid id for user fields and will
// get written out as the next unused number on save.
for( const SCH_FIELD& existing : fields )
{
if( existing.GetId() == field->GetId() )
{
field->SetId( -1 );
break;
}
}
}
fields.emplace_back( *field ); fields.emplace_back( *field );
delete field; delete field;
break; break;