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

Do NOT return false from a visitor unless you want to stop visiting! 

This fixes a bug where DRC would bail out early if any of
the colliding objects was a free pad.
This commit is contained in:
Jeff Young 2024-01-04 12:02:54 +00:00
parent aa4107ce2d
commit 91d144c720
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcbnew/drc/drc_test_provider_copper_clearance.cpp
View File

@ -612,6 +612,9 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testTrackClearances()
// Visitor: // Visitor:
[&]( BOARD_ITEM* other ) -> bool [&]( BOARD_ITEM* other ) -> bool
{ {
if( m_drcEngine->IsCancelled() )
return false;
if( other->Type() == PCB_PAD_T && static_cast<PAD*>( other )->IsFreePad() ) if( other->Type() == PCB_PAD_T && static_cast<PAD*>( other )->IsFreePad() )
{ {
if( other->GetEffectiveShape( layer )->Collide( trackShape.get() ) ) if( other->GetEffectiveShape( layer )->Collide( trackShape.get() ) )
@ -622,11 +625,11 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testTrackClearances()
if( it == freePadsUsageMap.end() ) if( it == freePadsUsageMap.end() )
{ {
freePadsUsageMap[ other ] = track->GetNetCode(); freePadsUsageMap[ other ] = track->GetNetCode();
return false; return true; // Continue colliding tests
} }
else if( it->second == track->GetNetCode() ) else if( it->second == track->GetNetCode() )
{ {
return false; return true; // Continue colliding tests
} }
} }
} }
@ -640,9 +643,7 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testTrackClearances()
std::swap( a, b ); std::swap( a, b );
// If we get an error, mark the pair as having a clearance error already // If we get an error, mark the pair as having a clearance error already
// Only continue if we are reporting all track errors if( !testSingleLayerItemAgainstItem( track, trackShape.get(), layer, other ) )
if( !testSingleLayerItemAgainstItem( track, trackShape.get(), layer,
other ) )
{ {
std::lock_guard<std::mutex> lock( checkedPairsMutex ); std::lock_guard<std::mutex> lock( checkedPairsMutex );
auto it = checkedPairs.find( { a, b } ); auto it = checkedPairs.find( { a, b } );
@ -650,7 +651,8 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testTrackClearances()
if( it != checkedPairs.end() ) if( it != checkedPairs.end() )
it->second.has_error = true; it->second.has_error = true;
return m_drcEngine->GetReportAllTrackErrors() && !m_drcEngine->IsCancelled(); if( !m_drcEngine->GetReportAllTrackErrors() )
return false; // We're done with this track
} }
return !m_drcEngine->IsCancelled(); return !m_drcEngine->IsCancelled();
@ -922,8 +924,6 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testPadAgainstItem( PAD* pad, SHAPE* pa
reportViolation( drce, pos, aLayer ); reportViolation( drce, pos, aLayer );
} }
} }
return;
} }