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

Respect context layer in eval 

When testing for a specific layer context, we should only return true if
the item either exists on that layer or if the context layer is
UNDEFINED_LAYER, meaning the layer value is not material to the test

Relates to https://gitlab.com/kicad/code/kicad/-/issues/9366
This commit is contained in:
Seth Hillbrand 2021-10-15 08:43:31 -07:00
parent ec10b12c6a
commit b88473e41f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/pcb_expr_evaluator.cpp
View File

@ -473,10 +473,14 @@ bool calcIsInsideArea( BOARD_ITEM* aItem, const EDA_RECT& aItemBBox, PCB_EXPR_CO
{
PCB_VIA* via = static_cast<PCB_VIA*>( aItem );
const SHAPE_CIRCLE holeShape( via->GetPosition(), via->GetDrillValue() );
LSET overlap = via->GetLayerSet() & aArea->GetLayerSet();
/// Avoid buried vias that don't overlap the zone's layers
if( ( via->GetLayerSet() & aArea->GetLayerSet() ).any() )
if( overlap.count() > 0 )
{
if( aCtx->GetLayer() == UNDEFINED_LAYER || overlap.Contains( aCtx->GetLayer() ) )
return areaOutline.Collide( &holeShape );
}
}
return false;
@ -548,8 +552,11 @@ bool calcIsInsideArea( BOARD_ITEM* aItem, const EDA_RECT& aItemBBox, PCB_EXPR_CO
{
for( PCB_LAYER_ID layer : aArea->GetLayerSet().Seq() )
{
if( zoneRTree->QueryColliding( aItemBBox, &areaOutline, layer ) )
return true;
if( aCtx->GetLayer() == layer || aCtx->GetLayer() == UNDEFINED_LAYER )
{
if( zoneRTree->QueryColliding( aItemBBox, &areaOutline, layer ) )
return true;
}
}
}
@ -557,7 +564,8 @@ bool calcIsInsideArea( BOARD_ITEM* aItem, const EDA_RECT& aItemBBox, PCB_EXPR_CO
}
else
{
if( !( aArea->GetLayerSet().Contains( aCtx->GetLayer() ) ) )
if( aCtx->GetLayer() != UNDEFINED_LAYER
&& !( aArea->GetLayerSet().Contains( aCtx->GetLayer() ) ) )
return false;
if( !shape )
@ -921,7 +929,7 @@ public:
PCB_LAYER_ID layerId = ToLAYER_ID( (int) AsDouble() );
return mask.test( layerId );
return mask.Contains( layerId );
}
};