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

Modify insideArea() to return true for zones only when fully inside. 

Intersections is enough for other objects.
This is also a bit of a DRC performance improvement.

Fixes https://gitlab.com/kicad/code/kicad/issues/6934
This commit is contained in:
Jeff Young 2021-01-05 21:28:42 +00:00
parent a4b3b3c115
commit a9d4d9d7f0
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/pcb_expr_evaluator.cpp
View File

@ -213,17 +213,23 @@ static void insideArea( LIBEVAL::CONTEXT* aCtx, void* self )
PCB_EXPR_VAR_REF* vref = static_cast<PCB_EXPR_VAR_REF*>( self );
BOARD_ITEM* item = vref ? vref->GetObject( aCtx ) : nullptr;
EDA_RECT itemBBox;
if( !item )
return;
if( item->Type() == PCB_ZONE_T || item->Type() == PCB_FP_ZONE_T )
itemBBox = static_cast<ZONE*>( item )->GetCachedBoundingBox();
else
itemBBox = item->GetBoundingBox();
auto insideZone =
[&]( ZONE* zone ) -> bool
{
if( !zone )
return false;
if( !zone->GetCachedBoundingBox().Intersects( item->GetBoundingBox() ) )
if( !zone->GetCachedBoundingBox().Intersects( itemBBox ) )
return false;
if( item->GetFlags() & HOLE_PROXY )
@ -289,10 +295,27 @@ static void insideArea( LIBEVAL::CONTEXT* aCtx, void* self )
return false;
}
if( item->Type() == PCB_ZONE_T || item->Type() == PCB_FP_ZONE_T )
{
ZONE* testZone = static_cast<ZONE*>( item );
std::shared_ptr<SHAPE> shape = item->GetEffectiveShape( context->GetLayer() );
if( !zone->GetCachedBoundingBox().Contains( itemBBox ) )
return false;
return zone->Outline()->Collide( shape.get() );
for( auto i = testZone->Outline()->CIterate( 0 ); i; i++ )
{
if( !zone->Outline()->Contains( *i ) )
return false;
}
return true;
}
else
{
std::shared_ptr<SHAPE> shape = item->GetEffectiveShape( context->GetLayer() );
return zone->Outline()->Collide( shape.get() );
}
};
if( arg->AsString() == "A" )