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

Make sure local zone clearances are factored into worstClearance. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6128
This commit is contained in:
Jeff Young 2020-10-23 14:26:46 +01:00
parent 58c006bc45
commit 1cdb8b5584
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/zone_filler.cpp
View File

@ -119,6 +119,24 @@ bool ZONE_FILLER::Fill( std::vector<ZONE_CONTAINER*>& aZones, bool aCheck, wxWin
}
}
// Update (and cache) the zone bounding boxes as well.
for( ZONE_CONTAINER* zone : m_board->Zones() )
{
zone->CacheBoundingBox();
worstClearance = std::max( worstClearance, zone->GetLocalClearance() );
}
for( MODULE* module : m_board->Modules() )
{
for( ZONE_CONTAINER* zone : module->Zones() )
{
zone->CacheBoundingBox();
worstClearance = std::max( worstClearance, zone->GetLocalClearance() );
}
}
// Sort by priority to reduce deferrals waiting on higher priority zones.
std::sort( aZones.begin(), aZones.end(),
[]( const ZONE_CONTAINER* lhs, const ZONE_CONTAINER* rhs )
@ -128,8 +146,6 @@ bool ZONE_FILLER::Fill( std::vector<ZONE_CONTAINER*>& aZones, bool aCheck, wxWin
for( ZONE_CONTAINER* zone : aZones )
{
zone->CacheBoundingBox();
// Rule areas are not filled
if( zone->GetIsRuleArea() )
continue;