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

Fix bug in new optionally-flashed via/pad zone fill logic.

This commit is contained in:
Jeff Young 2022-10-18 14:02:47 +01:00
parent 4633d251a5
commit 1f0fa3ef63
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/zone_filler.cpp
View File

@ -1438,13 +1438,14 @@ bool ZONE_FILLER::fillSingleZone( ZONE* aZone, PCB_LAYER_ID aLayer, SHAPE_POLY_S
&& via->GetBoundingBox().Intersects( zone_boundingbox ) ) && via->GetBoundingBox().Intersects( zone_boundingbox ) )
{ {
auto viaShape = via->GetEffectiveShape( aLayer, FLASHING::ALWAYS_FLASHED ); auto viaShape = via->GetEffectiveShape( aLayer, FLASHING::ALWAYS_FLASHED );
auto flashedShape = via->GetEffectiveShape( aLayer, FLASHING::DEFAULT );
// If the via collides with the zone's outline then we "own" the via. // If the via collides with the zone's outline then we "own" the via.
// If it collides with the fill then it's connected; otherwise not. // If it collides with the fill then it's connected; otherwise not.
if( aZone->Outline()->Collide( viaShape.get() ) ) if( aZone->Outline()->Collide( viaShape.get() ) )
{ {
if( aFillPolys.Collide( viaShape.get() ) ) if( aFillPolys.Collide( flashedShape.get() ) )
via->ZoneConnectionCache( aLayer ) = ZLC_CONNECTED; via->ZoneConnectionCache( aLayer ) = ZLC_CONNECTED;
else else
via->ZoneConnectionCache( aLayer ) = ZLC_UNCONNECTED; via->ZoneConnectionCache( aLayer ) = ZLC_UNCONNECTED;
@ -1464,13 +1465,14 @@ bool ZONE_FILLER::fillSingleZone( ZONE* aZone, PCB_LAYER_ID aLayer, SHAPE_POLY_S
&& pad->GetBoundingBox().Intersects( zone_boundingbox ) ) && pad->GetBoundingBox().Intersects( zone_boundingbox ) )
{ {
auto padShape = pad->GetEffectiveShape( aLayer, FLASHING::ALWAYS_FLASHED ); auto padShape = pad->GetEffectiveShape( aLayer, FLASHING::ALWAYS_FLASHED );
auto flashedShape = pad->GetEffectiveShape( aLayer, FLASHING::DEFAULT );
// If the pad collides with the zone's outline then we "own" the pad. // If the pad collides with the zone's outline then we "own" the pad.
// If it collides with the fill then it's connected; otherwise not. // If it collides with the fill then it's connected; otherwise not.
if( aZone->Outline()->Collide( padShape.get() ) ) if( aZone->Outline()->Collide( padShape.get() ) )
{ {
if( aFillPolys.Collide( padShape.get() ) ) if( aFillPolys.Collide( flashedShape.get() ) )
pad->ZoneConnectionCache( aLayer ) = ZLC_CONNECTED; pad->ZoneConnectionCache( aLayer ) = ZLC_CONNECTED;
else else
pad->ZoneConnectionCache( aLayer ) = ZLC_UNCONNECTED; pad->ZoneConnectionCache( aLayer ) = ZLC_UNCONNECTED;