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

TRACKS_CLEANER algo to merge collinear track segments: some minor fixes.

This commit is contained in:
jean-pierre charras 2019-06-29 09:12:19 +02:00
parent c8cd95a718
commit bcf690f901
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pcbnew/tracks_cleaner.cpp
View File

@ -74,6 +74,10 @@ bool TRACKS_CLEANER::CleanupBoard( bool aDryRun, DRC_LIST* aItemsList, bool aRem
m_itemsList = aItemsList; m_itemsList = aItemsList;
bool modified = false; bool modified = false;
// Clear the flag used to mark some segments as deleted, in dry run:
for( auto segment : m_brd->Tracks() )
segment->ClearFlags( IS_DELETED );
// delete redundant vias // delete redundant vias
if( aCleanVias ) if( aCleanVias )
modified |= cleanupVias(); modified |= cleanupVias();
@ -105,6 +109,10 @@ bool TRACKS_CLEANER::CleanupBoard( bool aDryRun, DRC_LIST* aItemsList, bool aRem
} }
} }
// Clear the flag used to mark some segments:
for( auto segment : m_brd->Tracks() )
segment->ClearFlags( IS_DELETED );
return modified; return modified;
} }
@ -176,7 +184,7 @@ bool TRACKS_CLEANER::cleanupVias()
// To delete through Via on THT pads at same location // To delete through Via on THT pads at same location
// Examine the list of connected pads: // Examine the list of connected pads:
// if one through pad is found, the via can be removed // if a through pad is found, the via can be removed
const auto pads = m_brd->GetConnectivity()->GetConnectedPads( via1 ); const auto pads = m_brd->GetConnectivity()->GetConnectedPads( via1 );
for( const auto pad : pads ) for( const auto pad : pads )
@ -457,9 +465,8 @@ bool TRACKS_CLEANER::cleanupSegments()
{ {
TRACK* candidate = static_cast<TRACK*>( connected->Parent() ); TRACK* candidate = static_cast<TRACK*>( connected->Parent() );
if( !candidate->IsOnLayer( segment->GetLayer() ) ) // Do not merge segments having different widths: it is a frequent case
continue; // to draw a track between 2 pads:
if( candidate->GetWidth() != segment->GetWidth() ) if( candidate->GetWidth() != segment->GetWidth() )
continue; continue;
@ -530,6 +537,8 @@ bool TRACKS_CLEANER::mergeCollinearSegments( TRACK* aSeg1, TRACK* aSeg2 )
aSeg2, aSeg2->GetPosition() ) ); aSeg2, aSeg2->GetPosition() ) );
} }
aSeg2->SetFlags( IS_DELETED );
if( !m_dryRun ) if( !m_dryRun )
{ {
m_commit.Modify( aSeg1 ); m_commit.Modify( aSeg1 );
@ -543,18 +552,13 @@ bool TRACKS_CLEANER::mergeCollinearSegments( TRACK* aSeg1, TRACK* aSeg2 )
aSeg1->SetState( BEGIN_ONPAD, pad->HitTest( aSeg1->GetStart() ) ); aSeg1->SetState( BEGIN_ONPAD, pad->HitTest( aSeg1->GetStart() ) );
aSeg1->SetState( END_ONPAD, pad->HitTest( aSeg1->GetEnd() ) ); aSeg1->SetState( END_ONPAD, pad->HitTest( aSeg1->GetEnd() ) );
} }
}
// Merge succesful, seg2 has to go away
// Merge succesful, seg2 has to go away
if( !m_dryRun && aSeg2 )
{
aSeg2->SetFlags( IS_DELETED );
m_brd->Remove( aSeg2 ); m_brd->Remove( aSeg2 );
m_commit.Removed( aSeg2 ); m_commit.Removed( aSeg2 );
} }
return !!aSeg2; return true;
} }

3
pcbnew/tracks_cleaner.h
View File

@ -91,6 +91,9 @@ private:
* helper function * helper function
* merge aTrackRef and aCandidate, when possible, * merge aTrackRef and aCandidate, when possible,
* i.e. when they are colinear, same width, and obviously same layer * i.e. when they are colinear, same width, and obviously same layer
* @return true if the segments are merged, false if not
* @param aSeg1 is the reference
* @param aSeg2 is the candidate, and after merging, the removed segment
*/ */
bool mergeCollinearSegments( TRACK* aSeg1, TRACK* aSeg2 ); bool mergeCollinearSegments( TRACK* aSeg1, TRACK* aSeg2 );