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

Honour sheet-level DNP & Exclude from BOM in symbol fields table.

Browse Source 
(And also in netlist exporter.)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18717
This commit is contained in:
Jeff Young 2024-12-22 21:19:04 +00:00
parent 7da8b42206
commit e04f873765
2 changed files with 11 additions and 5 deletions

10
eeschema/fields_data_model.cpp
View File

@ -555,11 +555,17 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::RebuildRows()
if( !m_filter.IsEmpty() && !WildCompareString( m_filter, ref.GetFullRef(), false ) )
continue;
if( m_excludeDNP && ref.GetSymbol()->GetDNP() )
if( m_excludeDNP && ( ref.GetSymbol()->GetDNP()
|| ref.GetSheetPath().GetDNP() ) )
{
continue;
}
if( !m_includeExcluded && ref.GetSymbol()->GetExcludedFromBOM() )
if( !m_includeExcluded && ( ref.GetSymbol()->GetExcludedFromBOM()
|| ref.GetSheetPath().GetExcludedFromBOM() ) )
{
continue;
}
// Check if the symbol if on the current sheet or, in the sheet path somewhere
// depending on scope

6
eeschema/netlist_exporters/netlist_exporter_xml.cpp
View File

@ -368,19 +368,19 @@ XNODE* NETLIST_EXPORTER_XML::makeSymbols( unsigned aCtl )
xproperty->AddAttribute( wxT( "value" ), sheetField.GetText() );
}
if( symbol->GetExcludedFromBOM() )
if( symbol->GetExcludedFromBOM() || sheet.GetExcludedFromBOM() )
{
xcomp->AddChild( xproperty = node( wxT( "property" ) ) );
xproperty->AddAttribute( wxT( "name" ), wxT( "exclude_from_bom" ) );
}
if( symbol->GetExcludedFromBoard() )
if( symbol->GetExcludedFromBoard() || sheet.GetExcludedFromBoard() )
{
xcomp->AddChild( xproperty = node( wxT( "property" ) ) );
xproperty->AddAttribute( wxT( "name" ), wxT( "exclude_from_board" ) );
}
if( symbol->GetDNP() )
if( symbol->GetDNP() || sheet.GetDNP() )
{
xcomp->AddChild( xproperty = node( wxT( "property" ) ) );
xproperty->AddAttribute( wxT( "name" ), wxT( "dnp" ) );