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

Be more responsive to user cancel.

This commit is contained in:
Jeff Young 2020-10-05 14:31:10 +01:00
parent 06f04ad99b
commit 0751965b2b
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcbnew/drc/drc_test_provider_matched_length.cpp
View File

@ -234,12 +234,13 @@ bool test::DRC_TEST_PROVIDER_MATCHED_LENGTH::runInternal( bool aDelayReportMode
if( !aDelayReportMode ) if( !aDelayReportMode )
{ {
reportPhase(( "Gathering length-constrained connections..." )); if( !reportPhase( _( "Gathering length-constrained connections..." ) ) )
return false;
} }
std::map<DRC_RULE*, CITEMS> itemSets; std::map<DRC_RULE*, CITEMS> itemSets;
auto evaluateLengthConstraints = auto evaluateLengthConstraints =
[&]( BOARD_ITEM *item ) -> bool [&]( BOARD_ITEM *item ) -> bool
{ {
const DRC_CONSTRAINT_TYPE_T constraintsToCheck[] = { const DRC_CONSTRAINT_TYPE_T constraintsToCheck[] = {

14
pcbnew/drc/drc_test_provider_silk_to_mask.cpp
View File

@ -41,8 +41,6 @@
- DRCE_SILK_MASK_CLEARANCE - DRCE_SILK_MASK_CLEARANCE
*/ */
namespace test {
class DRC_TEST_PROVIDER_SILK_TO_MASK : public ::DRC_TEST_PROVIDER class DRC_TEST_PROVIDER_SILK_TO_MASK : public ::DRC_TEST_PROVIDER
{ {
public: public:
@ -81,10 +79,8 @@ private:
int m_largestClearance; int m_largestClearance;
}; };
};
bool DRC_TEST_PROVIDER_SILK_TO_MASK::Run()
bool test::DRC_TEST_PROVIDER_SILK_TO_MASK::Run()
{ {
m_board = m_drcEngine->GetBoard(); m_board = m_drcEngine->GetBoard();
@ -98,7 +94,9 @@ bool test::DRC_TEST_PROVIDER_SILK_TO_MASK::Run()
} }
reportAux( "Worst clearance : %d nm", m_largestClearance ); reportAux( "Worst clearance : %d nm", m_largestClearance );
reportPhase( _( "Checking silkscreen for potential soldermask clipping..." ) );
if( !reportPhase( _( "Checking silkscreen for potential soldermask clipping..." ) ) )
return false;
DRC_RTREE maskTree, silkTree; DRC_RTREE maskTree, silkTree;
@ -183,7 +181,7 @@ bool test::DRC_TEST_PROVIDER_SILK_TO_MASK::Run()
} }
std::set<DRC_CONSTRAINT_TYPE_T> test::DRC_TEST_PROVIDER_SILK_TO_MASK::GetConstraintTypes() const std::set<DRC_CONSTRAINT_TYPE_T> DRC_TEST_PROVIDER_SILK_TO_MASK::GetConstraintTypes() const
{ {
return { DRC_CONSTRAINT_TYPE_SILK_TO_MASK }; return { DRC_CONSTRAINT_TYPE_SILK_TO_MASK };
} }
@ -191,5 +189,5 @@ std::set<DRC_CONSTRAINT_TYPE_T> test::DRC_TEST_PROVIDER_SILK_TO_MASK::GetConstra
namespace detail namespace detail
{ {
static DRC_REGISTER_TEST_PROVIDER<test::DRC_TEST_PROVIDER_SILK_TO_MASK> dummy; static DRC_REGISTER_TEST_PROVIDER<DRC_TEST_PROVIDER_SILK_TO_MASK> dummy;
} }

4
pcbnew/drc/drc_test_provider_silk_to_silk.cpp
View File

@ -93,7 +93,9 @@ bool DRC_TEST_PROVIDER_SILK_TO_SILK::Run()
} }
reportAux( "Worst clearance : %d nm", m_largestClearance ); reportAux( "Worst clearance : %d nm", m_largestClearance );
reportPhase( _( "Checking silkscreen for overlapping items..." ) );
if( !reportPhase( _( "Checking silkscreen for overlapping items..." ) ) )
return false;
DRC_RTREE silkTree; DRC_RTREE silkTree;