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

Deterministic algorithm for picking field values in multiunit components 

The original algorithm picked the value from the last component having
non empty value for a given field, but the processing order was
dependent on the layout of the components in the memory. It means that
for each component, the field values could have been taken from any
unit, randomly.

The patch improves the algorithm, trying to get all values from the unit
with the lowest number and resorts to other units only when there are
field values left empty.
This commit is contained in:
Maciej Suminski 2018-05-17 17:10:26 +02:00
parent dcf60f8e6f
commit 8f6ae70400
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eeschema/netlist_exporters/netlist_exporter_generic.cpp
View File

@ -91,17 +91,18 @@ void NETLIST_EXPORTER_GENERIC::addComponentFields( XNODE* xcomp, SCH_COMPONENT*
{ {
if( comp->GetUnitCount() > 1 ) if( comp->GetUnitCount() > 1 )
{ {
// Sadly, each unit of a component can have its own unique fields. This block // Sadly, each unit of a component can have its own unique fields. This
// finds the last non blank field and records it. Last guy wins and the order // block finds the unit with the lowest number having a non blank field
// of units occuring in a schematic hierarchy is variable. Therefore user // value and records it. Therefore user is best off setting fields
// is best off setting fields into only one unit. But this scavenger algorithm // into only the first unit. But this scavenger algorithm will find
// will find any non blank fields in all units and use the last non-blank field // any non blank fields in all units and use the first non-blank field
// for each unique field name. // for each unique field name.
COMP_FIELDS fields; COMP_FIELDS fields;
wxString ref = comp->GetRef( aSheet ); wxString ref = comp->GetRef( aSheet );
SCH_SHEET_LIST sheetList( g_RootSheet ); SCH_SHEET_LIST sheetList( g_RootSheet );
int minUnit = comp->GetUnit();
for( unsigned i = 0; i < sheetList.size(); i++ ) for( unsigned i = 0; i < sheetList.size(); i++ )
{ {
@ -117,26 +118,34 @@ void NETLIST_EXPORTER_GENERIC::addComponentFields( XNODE* xcomp, SCH_COMPONENT*
if( ref2.CmpNoCase( ref ) != 0 ) if( ref2.CmpNoCase( ref ) != 0 )
continue; continue;
// The last guy wins. User should only set fields in any one unit. int unit = comp2->GetUnit();
// The lowest unit number wins. User should only set fields in any one unit.
// remark: IsVoid() returns true for empty strings or the "~" string (empty field value) // remark: IsVoid() returns true for empty strings or the "~" string (empty field value)
if( !comp2->GetField( VALUE )->IsVoid() ) if( !comp2->GetField( VALUE )->IsVoid()
&& ( unit < minUnit || fields.value.IsEmpty() ) )
fields.value = comp2->GetField( VALUE )->GetText(); fields.value = comp2->GetField( VALUE )->GetText();
if( !comp2->GetField( FOOTPRINT )->IsVoid() ) if( !comp2->GetField( FOOTPRINT )->IsVoid()
&& ( unit < minUnit || fields.footprint.IsEmpty() ) )
fields.footprint = comp2->GetField( FOOTPRINT )->GetText(); fields.footprint = comp2->GetField( FOOTPRINT )->GetText();
if( !comp2->GetField( DATASHEET )->IsVoid() ) if( !comp2->GetField( DATASHEET )->IsVoid()
&& ( unit < minUnit || fields.datasheet.IsEmpty() ) )
fields.datasheet = comp2->GetField( DATASHEET )->GetText(); fields.datasheet = comp2->GetField( DATASHEET )->GetText();
for( int fldNdx = MANDATORY_FIELDS; fldNdx < comp2->GetFieldCount(); ++fldNdx ) for( int fldNdx = MANDATORY_FIELDS; fldNdx < comp2->GetFieldCount(); ++fldNdx )
{ {
SCH_FIELD* f = comp2->GetField( fldNdx ); SCH_FIELD* f = comp2->GetField( fldNdx );
if( f->GetText().size() ) if( f->GetText().size()
&& ( unit < minUnit || fields.f.count( f->GetName() ) == 0 ) )
{ {
fields.f[ f->GetName() ] = f->GetText(); fields.f[ f->GetName() ] = f->GetText();
} }
} }
minUnit = std::min( unit, minUnit );
} }
} }