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

Fix errant return and improve progress reporting.

This commit is contained in:
Jeff Young 2022-07-31 23:21:11 +01:00
parent 43df863df2
commit 7556d7152f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/drc/drc_test_provider_disallow.cpp
View File

@ -81,6 +81,7 @@ bool DRC_TEST_PROVIDER_DISALLOW::Run()
std::vector<ZONE*> antiCopperKeepouts; std::vector<ZONE*> antiCopperKeepouts;
std::vector<ZONE*> copperZones; std::vector<ZONE*> copperZones;
std::vector<std::pair<ZONE*, ZONE*>> toCache; std::vector<std::pair<ZONE*, ZONE*>> toCache;
std::atomic<size_t> done( 1 );
int totalCount = 0; int totalCount = 0;
forEachGeometryItem( {}, LSET::AllLayersMask(), forEachGeometryItem( {}, LSET::AllLayersMask(),
@ -107,15 +108,14 @@ bool DRC_TEST_PROVIDER_DISALLOW::Run()
} }
} }
PROGRESS_REPORTER* reporter = m_drcEngine->GetProgressReporter(); auto query_areas =
[&]( std::pair<ZONE* /* rule area */, ZONE* /* copper zone */> areaZonePair ) -> size_t
auto query_areas = [&]( std::pair<ZONE*, ZONE*> aCache ) -> size_t
{ {
if( m_drcEngine->IsCancelled() ) if( m_drcEngine->IsCancelled() )
return 0; return 0;
ZONE* ruleArea = aCache.first; ZONE* ruleArea = areaZonePair.first;
ZONE* copperZone = aCache.second; ZONE* copperZone = areaZonePair.second;
EDA_RECT areaBBox = ruleArea->GetCachedBoundingBox(); EDA_RECT areaBBox = ruleArea->GetCachedBoundingBox();
EDA_RECT copperBBox = copperZone->GetCachedBoundingBox(); EDA_RECT copperBBox = copperZone->GetCachedBoundingBox();
bool isInside = false; bool isInside = false;
@ -138,7 +138,7 @@ bool DRC_TEST_PROVIDER_DISALLOW::Run()
if( zoneRTree->QueryColliding( areaBBox, &areaPoly, layer ) ) if( zoneRTree->QueryColliding( areaBBox, &areaPoly, layer ) )
{ {
isInside = true; isInside = true;
return 0; break;
} }
if( m_drcEngine->IsCancelled() ) if( m_drcEngine->IsCancelled() )
@ -159,7 +159,7 @@ bool DRC_TEST_PROVIDER_DISALLOW::Run()
board->m_InsideAreaCache[ key ] = isInside; board->m_InsideAreaCache[ key ] = isInside;
} }
m_drcEngine->AdvanceProgress(); done.fetch_add( 1 );
return 1; return 1;
}; };
@ -169,18 +169,16 @@ bool DRC_TEST_PROVIDER_DISALLOW::Run()
returns.reserve( toCache.size() ); returns.reserve( toCache.size() );
for( auto& cache : toCache ) for( const std::pair<ZONE*, ZONE*>& areaZonePair : toCache )
returns.emplace_back( tp.submit( query_areas, cache ) ); returns.emplace_back( tp.submit( query_areas, areaZonePair ) );
for( auto& retval : returns ) for( const std::future<size_t>& retval : returns )
{ {
std::future_status status; std::future_status status;
do do
{ {
if( reporter ) m_drcEngine->ReportProgress( static_cast<double>( done ) / toCache.size() );
reporter->KeepRefreshing();
status = retval.wait_for( std::chrono::milliseconds( 100 ) ); status = retval.wait_for( std::chrono::milliseconds( 100 ) );
} while( status != std::future_status::ready ); } while( status != std::future_status::ready );
} }