honor rule area "exclude from BOM" in BOM
choose ResolveExcludedFromBOM() over GetExcludedFromBOM() to test refs for exclusion from BOM in order to honor a rule area's "exclude from BOM" flag for all refs inside that area. closes #23411.
This commit is contained in:
committed by
Jeff Young
parent
1920400200
commit
e81dae62ef
@@ -1016,7 +1016,7 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::RebuildRows()
|
||||
{
|
||||
for( const wxString& variantName : m_variantNames )
|
||||
{
|
||||
if( ref.GetSymbol()->GetExcludedFromBOM( &ref.GetSheetPath(), variantName )
|
||||
if( ref.GetSymbol()->ResolveExcludedFromBOM( &ref.GetSheetPath(), variantName )
|
||||
|| ref.GetSheetPath().GetExcludedFromBOM( variantName ) )
|
||||
{
|
||||
isExcluded = true;
|
||||
@@ -1026,7 +1026,7 @@ void FIELDS_EDITOR_GRID_DATA_MODEL::RebuildRows()
|
||||
}
|
||||
else
|
||||
{
|
||||
isExcluded = ref.GetSymbol()->GetExcludedFromBOM( &ref.GetSheetPath(), m_currentVariant )
|
||||
isExcluded = ref.GetSymbol()->ResolveExcludedFromBOM( &ref.GetSheetPath(), m_currentVariant )
|
||||
|| ref.GetSheetPath().GetExcludedFromBOM( m_currentVariant );
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user