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

DIALOG_CHANGE_SYMBOLS: fix a bug introduced by my commit 686b32db 

the filtering for mandatory fields was disabled.
This commit is contained in:
jean-pierre charras 2021-11-13 13:46:54 +01:00
parent 2f99621bd3
commit e218471d24
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -385,14 +385,23 @@ void DIALOG_CHANGE_SYMBOLS::onOkButtonClicked( wxCommandEvent& aEvent )
m_messagePanel->Clear(); m_messagePanel->Clear();
m_messagePanel->Flush( false ); m_messagePanel->Flush( false );
// Create the set of fields to be updated // Create the set of fields to be updated. Use non translated (canonical) names
// for mandatory fields
m_updateFields.clear(); m_updateFields.clear();
for( unsigned i = 0; i < m_fieldsBox->GetCount(); ++i ) for( unsigned i = 0; i < m_fieldsBox->GetCount(); ++i )
{ {
if( m_fieldsBox->IsChecked( i ) ) if( m_fieldsBox->IsChecked( i ) )
{
if( i < MANDATORY_FIELDS )
{
LIB_FIELD dummy_field( i );
m_updateFields.insert( dummy_field.GetCanonicalName() );
}
else
m_updateFields.insert( m_fieldsBox->GetString( i ) ); m_updateFields.insert( m_fieldsBox->GetString( i ) );
} }
}
if( processMatchingSymbols() ) if( processMatchingSymbols() )
{ {
@ -602,8 +611,8 @@ bool DIALOG_CHANGE_SYMBOLS::processSymbol( SCH_SYMBOL* aSymbol, const SCH_SHEET_
LIB_FIELD* libField = nullptr; LIB_FIELD* libField = nullptr;
// Mandatory fields always exist in m_updateFields, but these names can be translated. // Mandatory fields always exist in m_updateFields, but these names can be translated.
// so do not try to search them in list: they can be no found by name). // so use GetCanonicalName().
if( i >= MANDATORY_FIELDS && !alg::contains( m_updateFields, field.GetName() ) ) if( !alg::contains( m_updateFields, field.GetCanonicalName() ) )
continue; continue;
if( i < MANDATORY_FIELDS ) if( i < MANDATORY_FIELDS )
@ -660,7 +669,7 @@ bool DIALOG_CHANGE_SYMBOLS::processSymbol( SCH_SYMBOL* aSymbol, const SCH_SHEET_
{ {
const LIB_FIELD& libField = *libFields[i]; const LIB_FIELD& libField = *libFields[i];
if( !alg::contains( m_updateFields, libField.GetName() ) ) if( !alg::contains( m_updateFields, libField.GetCanonicalName() ) )
continue; continue;
if( !aSymbol->FindField( libField.GetName(), false ) ) if( !aSymbol->FindField( libField.GetName(), false ) )