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

Don't double-check DRC clearances (a:b and b:a). 

Fixes https://gitlab.com/kicad/code/kicad/issues/6417
This commit is contained in:
Jeff Young 2020-11-17 16:58:14 +00:00
parent 8c5c902fa3
commit b2d86ec7c9
2 changed files with 75 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pcbnew/drc/drc_test_provider_copper_clearance.cpp
View File

@ -359,6 +359,8 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testTrackClearances()
reportAux( "Testing %d tracks & vias...", m_board->Tracks().size() ); reportAux( "Testing %d tracks & vias...", m_board->Tracks().size() );
std::map< std::pair<BOARD_ITEM*, BOARD_ITEM*>, int> checkedPairs;
for( TRACK* track : m_board->Tracks() ) for( TRACK* track : m_board->Tracks() )
{ {
if( !reportProgress( ii++, m_board->Tracks().size(), delta ) ) if( !reportProgress( ii++, m_board->Tracks().size(), delta ) )
@ -380,7 +382,23 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testTrackClearances()
if( otherCItem && otherCItem->GetNetCode() == track->GetNetCode() ) if( otherCItem && otherCItem->GetNetCode() == track->GetNetCode() )
return false; return false;
BOARD_ITEM* a = track;
BOARD_ITEM* b = other;
// store canonical order so we don't collide in both directions
// (a:b and b:a)
if( static_cast<void*>( a ) > static_cast<void*>( b ) )
std::swap( a, b );
if( checkedPairs.count( { a, b } ) )
{
return false;
}
else
{
checkedPairs[ { a, b } ] = 1;
return true; return true;
}
}, },
// Visitor: // Visitor:
[&]( BOARD_ITEM* other ) -> bool [&]( BOARD_ITEM* other ) -> bool
@ -519,6 +537,7 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testPadClearances( )
reportAux( "Testing %d pads...", count ); reportAux( "Testing %d pads...", count );
int ii = 0; int ii = 0;
std::map< std::pair<BOARD_ITEM*, BOARD_ITEM*>, int> checkedPairs;
for( FOOTPRINT* footprint : m_board->Footprints() ) for( FOOTPRINT* footprint : m_board->Footprints() )
{ {
@ -538,7 +557,23 @@ void DRC_TEST_PROVIDER_COPPER_CLEARANCE::testPadClearances( )
if( other->HasFlag( SKIP_STRUCT ) ) if( other->HasFlag( SKIP_STRUCT ) )
return false; return false;
BOARD_ITEM* a = pad;
BOARD_ITEM* b = other;
// store canonical order so we don't collide in both directions
// (a:b and b:a)
if( static_cast<void*>( a ) > static_cast<void*>( b ) )
std::swap( a, b );
if( checkedPairs.count( { a, b } ) )
{
return false;
}
else
{
checkedPairs[ { a, b } ] = 1;
return true; return true;
}
}, },
// Visitor // Visitor
[&]( BOARD_ITEM* other ) -> bool [&]( BOARD_ITEM* other ) -> bool

36
pcbnew/drc/drc_test_provider_hole_clearance.cpp
View File

@ -165,6 +165,8 @@ bool DRC_TEST_PROVIDER_HOLE_CLEARANCE::Run()
forEachGeometryItem( { PCB_PAD_T, PCB_VIA_T }, LSET::AllLayersMask(), addToHoleTree ); forEachGeometryItem( { PCB_PAD_T, PCB_VIA_T }, LSET::AllLayersMask(), addToHoleTree );
std::map< std::pair<BOARD_ITEM*, BOARD_ITEM*>, int> checkedPairs;
for( TRACK* track : m_board->Tracks() ) for( TRACK* track : m_board->Tracks() )
{ {
if( track->Type() != PCB_VIA_T ) if( track->Type() != PCB_VIA_T )
@ -184,7 +186,23 @@ bool DRC_TEST_PROVIDER_HOLE_CLEARANCE::Run()
if( other->HasFlag( SKIP_STRUCT ) ) if( other->HasFlag( SKIP_STRUCT ) )
return false; return false;
BOARD_ITEM* a = via;
BOARD_ITEM* b = other;
// store canonical order so we don't collide in both directions
// (a:b and b:a)
if( static_cast<void*>( a ) > static_cast<void*>( b ) )
std::swap( a, b );
if( checkedPairs.count( { a, b } ) )
{
return false;
}
else
{
checkedPairs[ { a, b } ] = 1;
return true; return true;
}
}, },
// Visitor: // Visitor:
[&]( BOARD_ITEM* other ) -> bool [&]( BOARD_ITEM* other ) -> bool
@ -196,6 +214,8 @@ bool DRC_TEST_PROVIDER_HOLE_CLEARANCE::Run()
via->SetFlags( SKIP_STRUCT ); via->SetFlags( SKIP_STRUCT );
} }
checkedPairs.clear();
for( FOOTPRINT* footprint : m_board->Footprints() ) for( FOOTPRINT* footprint : m_board->Footprints() )
{ {
for( PAD* pad : footprint->Pads() ) for( PAD* pad : footprint->Pads() )
@ -212,7 +232,23 @@ bool DRC_TEST_PROVIDER_HOLE_CLEARANCE::Run()
if( other->HasFlag( SKIP_STRUCT ) ) if( other->HasFlag( SKIP_STRUCT ) )
return false; return false;
BOARD_ITEM* a = pad;
BOARD_ITEM* b = other;
// store canonical order so we don't collide in both directions
// (a:b and b:a)
if( static_cast<void*>( a ) > static_cast<void*>( b ) )
std::swap( a, b );
if( checkedPairs.count( { a, b } ) )
{
return false;
}
else
{
checkedPairs[ { a, b } ] = 1;
return true; return true;
}
}, },
// Visitor: // Visitor:
[&]( BOARD_ITEM* other ) -> bool [&]( BOARD_ITEM* other ) -> bool