AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

Handle duplicate entries in BOM presets

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20342
This commit is contained in:
Jon Evans 2025-03-17 18:37:52 -04:00
parent 2ef123d9e1
commit 4ef0d3554e
1 changed files with 5 additions and 1 deletions

6
eeschema/fields_data_model.cpp
View File

@ -140,6 +140,8 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::SetFieldsOrder( const std::vector<wxString>&
{
size_t foundCount = 0;
wxCHECK( aNewOrder.size() == m_cols.size(), /* void */ );
for( const wxString& newField : aNewOrder )
{
for( size_t i = 0; i < m_cols.size(); i++ )
@ -898,15 +900,17 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::ApplyBomPreset( const BOM_PRESET& aPreset )
SetGroupColumn( i, false );
}
std::set<wxString> seen;
std::vector<wxString> order;
// Set columns that are present and shown
for( const BOM_FIELD& field : aPreset.fieldsOrdered )
{
// Ignore empty fields
if( !field.name )
if( !field.name || seen.count( field.name ) )
continue;
seen.insert( field.name );
order.emplace_back( field.name );
int col = GetFieldNameCol( field.name );