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

(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:22:30 +00:00
parent 7da8b42206
commit e04f873765
2 changed files with 11 additions and 5 deletions
+8 -2
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