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

Don't copy built-in presets to user list.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/19885
This commit is contained in:
Jeff Young 2025-02-11 15:46:49 +00:00
parent 7c118c02f1
commit add6705e98
1 changed files with 22 additions and 12 deletions

34
eeschema/eeschema_jobs_handler.cpp
View File

@ -571,14 +571,19 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
// Load a preset if one is specified
if( !aBomJob->m_bomPresetName.IsEmpty() )
{
// Make sure the built-in presets are loaded
for( const BOM_PRESET& p : BOM_PRESET::BuiltInPresets() )
sch->Settings().m_BomPresets.emplace_back( p );
// Find the preset
BOM_PRESET* schPreset = nullptr;
const BOM_PRESET* schPreset = nullptr;
for( BOM_PRESET& p : sch->Settings().m_BomPresets )
for( const BOM_PRESET& p : BOM_PRESET::BuiltInPresets() )
{
if( p.name == aBomJob->m_bomPresetName )
{
schPreset = &p;
break;
}
}
for( const BOM_PRESET& p : sch->Settings().m_BomPresets )
{
if( p.name == aBomJob->m_bomPresetName )
{
@ -707,14 +712,19 @@ int EESCHEMA_JOBS_HANDLER::JobExportBom( JOB* aJob )
// Load a format preset if one is specified
if( !aBomJob->m_bomFmtPresetName.IsEmpty() )
{
// Make sure the built-in presets are loaded
for( const BOM_FMT_PRESET& p : BOM_FMT_PRESET::BuiltInPresets() )
sch->Settings().m_BomFmtPresets.emplace_back( p );
// Find the preset
BOM_FMT_PRESET* schFmtPreset = nullptr;
const BOM_FMT_PRESET* schFmtPreset = nullptr;
for( BOM_FMT_PRESET& p : sch->Settings().m_BomFmtPresets )
for( const BOM_FMT_PRESET& p : BOM_FMT_PRESET::BuiltInPresets() )
{
if( p.name == aBomJob->m_bomFmtPresetName )
{
schFmtPreset = &p;
break;
}
}
for( const BOM_FMT_PRESET& p : sch->Settings().m_BomFmtPresets )
{
if( p.name == aBomJob->m_bomFmtPresetName )
{