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

Better progress reporting for thermal connections.

This commit is contained in:
Jeff Young 2022-07-30 23:37:10 +01:00
parent b0a9cea6f6
commit f2f04b1d20
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/drc/drc_test_provider_zone_connections.cpp
View File

@ -186,11 +186,16 @@ bool DRC_TEST_PROVIDER_ZONE_CONNECTIONS::Run()
return false; // DRC cancelled return false; // DRC cancelled
std::vector< std::pair<ZONE*, PCB_LAYER_ID> > zoneLayers; std::vector< std::pair<ZONE*, PCB_LAYER_ID> > zoneLayers;
std::atomic<size_t> done( 1 );
size_t total_effort = 0;
for( ZONE* zone : board->m_DRCCopperZones ) for( ZONE* zone : board->m_DRCCopperZones )
{ {
for( PCB_LAYER_ID layer : zone->GetLayerSet().Seq() ) for( PCB_LAYER_ID layer : zone->GetLayerSet().Seq() )
{
zoneLayers.push_back( { zone, layer } ); zoneLayers.push_back( { zone, layer } );
total_effort += zone->GetFilledPolysList( layer )->FullPointCount();
}
} }
thread_pool& tp = GetKiCadThreadPool(); thread_pool& tp = GetKiCadThreadPool();
@ -198,26 +203,29 @@ bool DRC_TEST_PROVIDER_ZONE_CONNECTIONS::Run()
returns.reserve( zoneLayers.size() ); returns.reserve( zoneLayers.size() );
for( auto& zonelayer : zoneLayers ) for( const std::pair<ZONE*, PCB_LAYER_ID>& zonelayer : zoneLayers )
{ {
returns.emplace_back( tp.submit([&]( ZONE* aZone, PCB_LAYER_ID aLayer ) -> int returns.emplace_back( tp.submit(
[&]( ZONE* aZone, PCB_LAYER_ID aLayer ) -> int
{ {
if( !m_drcEngine->IsCancelled() ) if( !m_drcEngine->IsCancelled() )
{ {
testZoneLayer( aZone, aLayer ); testZoneLayer( aZone, aLayer );
m_drcEngine->AdvanceProgress(); done.fetch_add( aZone->GetFilledPolysList( aLayer )->FullPointCount() );
}
return 0;
}, zonelayer.first, zonelayer.second ) );
} }
for( auto& retval : returns ) return 0;
},
zonelayer.first, zonelayer.second ) );
}
for( std::future<int>& retval : returns )
{ {
std::future_status status; std::future_status status;
do do
{ {
m_drcEngine->KeepRefreshing(); m_drcEngine->ReportProgress( static_cast<double>( done ) / total_effort );
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 );
} }