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

TRACKS_CLEANER: fixes after changing the connectivity algorithm

This commit is contained in:
Tomasz Włostowski 2017-03-28 13:18:15 +02:00
parent 6008abaad9
commit 07b7600ae5
1 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pcbnew/clean.cpp
View File

@ -96,6 +96,12 @@ private:
*/ */
bool clean_segments(); bool clean_segments();
/**
* helper function
* Rebuild list of tracks, and connected tracks
* this info must be rebuilt when tracks are erased
*/
void buildTrackConnectionInfo();
/** /**
* helper function * helper function
@ -144,6 +150,41 @@ void PCB_EDIT_FRAME::Clean_Pcb()
m_canvas->Refresh( true ); m_canvas->Refresh( true );
} }
void TRACKS_CLEANER::buildTrackConnectionInfo()
{
auto connectivity = m_brd->GetConnectivity();
// rebuild the connectivity, just in case
connectivity->Build(m_brd);
// clear flags and variables used in cleanup
for( TRACK* track = m_brd->m_Track; track != NULL; track = track->Next() )
{
track->start = NULL;
track->end = NULL;
track->SetState( START_ON_PAD | END_ON_PAD | BUSY, false );
}
for( TRACK* track = m_brd->m_Track; track != NULL; track = track->Next() )
{
// Mark track if connected to pads
for( auto pad : connectivity->GetConnectedPads( track ) )
{
if( pad->HitTest( track->GetStart() ) )
{
track->start = pad;
track->SetState( START_ON_PAD, true );
}
if( pad->HitTest( track->GetEnd() ) )
{
track->end = pad;
track->SetState( END_ON_PAD, true );
}
}
}
}
/* Main cleaning function. /* Main cleaning function.
* Delete * Delete
@ -170,24 +211,17 @@ bool TRACKS_CLEANER::CleanupBoard( bool aRemoveMisConnected,
else if( aRemoveMisConnected ) else if( aRemoveMisConnected )
modified |= delete_null_segments(); modified |= delete_null_segments();
if( aRemoveMisConnected ) buildTrackConnectionInfo();
{
if( removeBadTrackSegments() )
{
modified = true;
// Refresh track connection info if( aRemoveMisConnected )
//buildTrackConnectionInfo(); FIXME: update connectivity modified |= removeBadTrackSegments();
}
} buildTrackConnectionInfo();
// Delete dangling tracks // Delete dangling tracks
if( aDeleteUnconnected ) if( aDeleteUnconnected )
{ {
if( modified ) // Refresh track connection info buildTrackConnectionInfo();
{
//buildTrackConnectionInfo(); FIXME: update connectivity
}
if( deleteDanglingTracks() ) if( deleteDanglingTracks() )
{ {
@ -658,6 +692,7 @@ TRACK* TRACKS_CLEANER::mergeCollinearSegmentIfPossible( TRACK* aTrackRef, TRACK*
* of pt_segm (pt_segm will be removed later) */ * of pt_segm (pt_segm will be removed later) */
if( aTrackRef->GetStart() == aCandidate->GetStart() ) if( aTrackRef->GetStart() == aCandidate->GetStart() )
{ {
m_commit.Modify( aTrackRef );
aTrackRef->SetStart( aCandidate->GetEnd() ); aTrackRef->SetStart( aCandidate->GetEnd() );
aTrackRef->start = aCandidate->end; aTrackRef->start = aCandidate->end;
aTrackRef->SetState( START_ON_PAD, aCandidate->GetState( END_ON_PAD ) ); aTrackRef->SetState( START_ON_PAD, aCandidate->GetState( END_ON_PAD ) );
@ -665,6 +700,7 @@ TRACK* TRACKS_CLEANER::mergeCollinearSegmentIfPossible( TRACK* aTrackRef, TRACK*
} }
else else
{ {
m_commit.Modify( aTrackRef );
aTrackRef->SetStart( aCandidate->GetStart() ); aTrackRef->SetStart( aCandidate->GetStart() );
aTrackRef->start = aCandidate->start; aTrackRef->start = aCandidate->start;
aTrackRef->SetState( START_ON_PAD, aCandidate->GetState( START_ON_PAD ) ); aTrackRef->SetState( START_ON_PAD, aCandidate->GetState( START_ON_PAD ) );
@ -681,6 +717,7 @@ TRACK* TRACKS_CLEANER::mergeCollinearSegmentIfPossible( TRACK* aTrackRef, TRACK*
* of pt_segm (pt_segm will be removed later) */ * of pt_segm (pt_segm will be removed later) */
if( aTrackRef->GetEnd() == aCandidate->GetStart() ) if( aTrackRef->GetEnd() == aCandidate->GetStart() )
{ {
m_commit.Modify( aTrackRef );
aTrackRef->SetEnd( aCandidate->GetEnd() ); aTrackRef->SetEnd( aCandidate->GetEnd() );
aTrackRef->end = aCandidate->end; aTrackRef->end = aCandidate->end;
aTrackRef->SetState( END_ON_PAD, aCandidate->GetState( END_ON_PAD ) ); aTrackRef->SetState( END_ON_PAD, aCandidate->GetState( END_ON_PAD ) );
@ -688,6 +725,7 @@ TRACK* TRACKS_CLEANER::mergeCollinearSegmentIfPossible( TRACK* aTrackRef, TRACK*
} }
else else
{ {
m_commit.Modify( aTrackRef );
aTrackRef->SetEnd( aCandidate->GetStart() ); aTrackRef->SetEnd( aCandidate->GetStart() );
aTrackRef->end = aCandidate->start; aTrackRef->end = aCandidate->start;
aTrackRef->SetState( END_ON_PAD, aCandidate->GetState( START_ON_PAD ) ); aTrackRef->SetState( END_ON_PAD, aCandidate->GetState( START_ON_PAD ) );