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

We only want "actual" shapes, not anything derived from SHAPE. 

Also fixes a bug where GetParentFootprint would get confused by
groups.

Fixes https://gitlab.com/kicad/code/kicad/issues/11741
This commit is contained in:
Jeff Young 2022-06-04 00:01:52 +01:00
parent d2a9cbe6e8
commit 8b75a32cfa
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pcbnew/drc/drc_test_provider_silk_clearance.cpp
View File

@ -173,18 +173,23 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
};
targetTree.QueryCollidingPairs( &silkTree, layerPairs,
[&]( const DRC_RTREE::LAYER_PAIR& aLayers, DRC_RTREE::ITEM_WITH_SHAPE* aRefItem,
DRC_RTREE::ITEM_WITH_SHAPE* aTestItem, bool* aCollisionDetected ) -> bool
[&]( const DRC_RTREE::LAYER_PAIR& aLayers, DRC_RTREE::ITEM_WITH_SHAPE* aRefItemShape,
DRC_RTREE::ITEM_WITH_SHAPE* aTestItemShape, bool* aCollisionDetected ) -> bool
{
BOARD_ITEM* aRefItem = aRefItemShape->parent;
SHAPE* aRefShape = aRefItemShape->shape;
BOARD_ITEM* aTestItem = aTestItemShape->parent;
SHAPE* aTestShape = aTestItemShape->shape;
if( m_drcEngine->IsErrorLimitExceeded( DRCE_OVERLAPPING_SILK ) )
return false;
if( isInvisibleText( aRefItem->parent ) || isInvisibleText( aTestItem->parent ) )
if( isInvisibleText( aRefItem ) || isInvisibleText( aTestItem ) )
return true;
DRC_CONSTRAINT constraint = m_drcEngine->EvalRules( SILK_CLEARANCE_CONSTRAINT,
aRefItem->parent,
aTestItem->parent,
aRefItem, aTestItem,
aLayers.second );
if( constraint.IsNull() || constraint.GetSeverity() == RPT_SEVERITY_IGNORE )
@ -200,19 +205,14 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
// Graphics are often compound shapes so ignore collisions between shapes in a
// single footprint or on the board.
PCB_SHAPE* refGraphic = dynamic_cast<PCB_SHAPE*>( aRefItem->parent );
PCB_SHAPE* testGraphic = dynamic_cast<PCB_SHAPE*>( aTestItem->parent );
if( refGraphic && testGraphic )
if( aRefItem->Type() == PCB_SHAPE_T && aTestItem->Type() == PCB_SHAPE_T )
{
FOOTPRINT *refParentFP = dynamic_cast<FOOTPRINT*>( refGraphic->GetParent() );
FOOTPRINT *testParentFP = dynamic_cast<FOOTPRINT*>( testGraphic->GetParent() );
if( refParentFP == testParentFP ) // also true when both are nullptr
// also true when both are nullptr
if( aRefItem->GetParentFootprint() == aTestItem->GetParentFootprint() )
return true;
}
if( aRefItem->shape->Collide( aTestItem->shape, minClearance, &actual, &pos ) )
if( aRefShape->Collide( aTestShape, minClearance, &actual, &pos ) )
{
std::shared_ptr<DRC_ITEM> drcItem = DRC_ITEM::Create( DRCE_OVERLAPPING_SILK );
@ -226,7 +226,7 @@ bool DRC_TEST_PROVIDER_SILK_CLEARANCE::Run()
drcItem->SetErrorMessage( drcItem->GetErrorText() + wxS( " " ) + m_msg );
}
drcItem->SetItems( aRefItem->parent, aTestItem->parent );
drcItem->SetItems( aRefItem, aTestItem );
drcItem->SetViolatingRule( constraint.GetParentRule() );
reportViolation( drcItem, pos, aLayers.second );

5
pcbnew/pcb_shape.cpp
View File

@ -148,10 +148,7 @@ void PCB_SHAPE::Flip( const VECTOR2I& aCentre, bool aFlipLeftRight )
FOOTPRINT* PCB_SHAPE::GetParentFootprint() const
{
if( !m_parent || m_parent->Type() != PCB_FOOTPRINT_T )
return nullptr;
return (FOOTPRINT*) m_parent;
return dynamic_cast<FOOTPRINT*>( BOARD_ITEM::GetParentFootprint() );
}