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

Fix issue when we ask if a pad is connected to a zone we're in the middle of filling.

This commit is contained in:
Jeff Young 2022-03-12 14:11:56 +00:00
parent 89e61ff73b
commit 0a8718cd1d
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/connectivity/connectivity_data.cpp
View File

@ -427,10 +427,12 @@ bool CONNECTIVITY_DATA::IsConnectedOnLayer( const BOARD_CONNECTED_ITEM *aItem, i
} }
else if( CN_ZONE_LAYER* zoneLayer = dynamic_cast<CN_ZONE_LAYER*>( connected ) ) else if( CN_ZONE_LAYER* zoneLayer = dynamic_cast<CN_ZONE_LAYER*>( connected ) )
{ {
BOARD_CONNECTED_ITEM* item = zoneLayer->Parent(); ZONE* zone = static_cast<ZONE*>( zoneLayer->Parent() );
int islandIdx = zoneLayer->SubpolyIndex(); int islandIdx = zoneLayer->SubpolyIndex();
const auto& fill = static_cast<ZONE*>( item )->GetFilledPolysList( layer ); if( zone->IsFilled() )
{
const auto& fill = zone->GetFilledPolysList( layer );
const auto& padOutline = pad->GetEffectivePolygon()->Outline( 0 ); const auto& padOutline = pad->GetEffectivePolygon()->Outline( 0 );
for( const VECTOR2I& pt : fill->COutline( islandIdx ).CPoints() ) for( const VECTOR2I& pt : fill->COutline( islandIdx ).CPoints() )
@ -438,9 +440,10 @@ bool CONNECTIVITY_DATA::IsConnectedOnLayer( const BOARD_CONNECTED_ITEM *aItem, i
if( !padOutline.PointInside( pt ) ) if( !padOutline.PointInside( pt ) )
return true; return true;
} }
}
// If the entire island is inside the pad's flashing then the pad won't // If the zone isn't filled, or the entire island is inside the pad's
// *actually* connect to anything *else* so don't consider it connected. // flashing then the pad won't _actually_ connect to anything else.
return false; return false;
} }
} }