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

DIALOG_SYMBOL_FIELDS_TABLE::syncBomPresetSelection(): fix not working comparison 

for non English languages.

The main issue was the function compared a English string to a translated string.
However, even with this fix, the code, although working, is not very good:
It compare 2 members (BOM_PRESET .sortField string) that are not very significant
and can be or not translated.
This commit is contained in:
jean-pierre charras 2024-05-15 16:25:05 +02:00
parent 498d2c9db1
commit f17b13655b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/dialogs/dialog_symbol_fields_table.cpp
View File

@ -1507,8 +1507,7 @@ void DIALOG_SYMBOL_FIELDS_TABLE::syncBomPresetSelection()
const BOM_PRESET& preset = aPair.second;
// Check the simple settings first
if( !( preset.sortField == current.sortField
&& preset.sortAsc == current.sortAsc
if( !( preset.sortAsc == current.sortAsc
&& preset.filterString == current.filterString
&& preset.groupSymbols == current.groupSymbols
&& preset.excludeDNP == current.excludeDNP ) )
@ -1516,6 +1515,16 @@ void DIALOG_SYMBOL_FIELDS_TABLE::syncBomPresetSelection()
return false;
}
// We should compare preset.name and current.name.
// unfortunately current.name is empty because
// m_dataModel->GetBomSettings() does not store the .name member
// So use sortField member as a (not very efficient) auxiliary filter.
// sortField can be translated in m_bomPresets list,
// so current.sortField needs to be translated
// Probably this not efficient and error prone test should be removed (JPC).
if( preset.sortField != wxGetTranslation( current.sortField ) )
return false;
// Only compare shown or grouped fields
std::vector<BOM_FIELD> A, B;
@ -1540,7 +1549,6 @@ void DIALOG_SYMBOL_FIELDS_TABLE::syncBomPresetSelection()
// but these items are translated if they are predefined items.
bool do_translate = it->second.readOnly;
wxString text = do_translate ? wxGetTranslation( it->first ) : it->first;
m_cbBomPresets->SetStringSelection( text );
}
else