Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias.Performance enhancements for Cleanup Tracks & Vias. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11119
7.0
Jeff Young 4 years ago
parent
41c0009c51
commit
c4c8848fa3
5 changed files with 115 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      pcbnew/cleanup_item.cpp
  2. 3
      pcbnew/cleanup_item.h
  3. 11
      pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
  4. 103
      pcbnew/tracks_cleaner.cpp
  5. 5
      pcbnew/tracks_cleaner.h

1
pcbnew/cleanup_item.cpp
View File

@ -43,7 +43,6 @@ wxString CLEANUP_ITEM::GetErrorText( int aCode, bool aTranslate ) const
switch( aCode ) switch( aCode )
{ {
// For cleanup tracks and vias: // For cleanup tracks and vias:
case CLEANUP_CHECKING_ZONE_FILLS: msg = _HKI( "Checking zone fills..." ); break;
case CLEANUP_SHORTING_TRACK: msg = _HKI( "Remove track shorting two nets" ); break; case CLEANUP_SHORTING_TRACK: msg = _HKI( "Remove track shorting two nets" ); break;
case CLEANUP_SHORTING_VIA: msg = _HKI( "Remove via shorting two nets" ); break; case CLEANUP_SHORTING_VIA: msg = _HKI( "Remove via shorting two nets" ); break;
case CLEANUP_REDUNDANT_VIA: msg = _HKI( "Remove redundant via" ); break; case CLEANUP_REDUNDANT_VIA: msg = _HKI( "Remove redundant via" ); break;

3
pcbnew/cleanup_item.h
View File

@ -31,8 +31,7 @@ class PCB_BASE_FRAME;
enum CLEANUP_RC_CODE { enum CLEANUP_RC_CODE {
CLEANUP_FIRST = DRCE_LAST + 1, CLEANUP_FIRST = DRCE_LAST + 1,
CLEANUP_CHECKING_ZONE_FILLS = CLEANUP_FIRST,
CLEANUP_SHORTING_TRACK,
CLEANUP_SHORTING_TRACK = CLEANUP_FIRST,
CLEANUP_SHORTING_VIA, CLEANUP_SHORTING_VIA,
CLEANUP_REDUNDANT_VIA, CLEANUP_REDUNDANT_VIA,
CLEANUP_DUPLICATE_TRACK, CLEANUP_DUPLICATE_TRACK,

11
pcbnew/dialogs/dialog_cleanup_tracks_and_vias.cpp
View File

@ -131,24 +131,20 @@ void DIALOG_CLEANUP_TRACKS_AND_VIAS::doCleanup( bool aDryRun )
if( m_firstRun ) if( m_firstRun )
{ {
m_items.push_back( std::make_shared<CLEANUP_ITEM>( CLEANUP_CHECKING_ZONE_FILLS ) );
RC_ITEMS_PROVIDER* provider = new VECTOR_CLEANUP_ITEMS_PROVIDER( &m_items );
m_changesTreeModel->SetProvider( provider );
m_reporter->Report( _( "Check zones..." ) ); m_reporter->Report( _( "Check zones..." ) );
wxSafeYield(); // Timeslice to update UI
m_parentFrame->GetToolManager()->GetTool<ZONE_FILLER_TOOL>()->CheckAllZones( this ); m_parentFrame->GetToolManager()->GetTool<ZONE_FILLER_TOOL>()->CheckAllZones( this );
wxSafeYield(); // Timeslice to close zone progress reporter wxSafeYield(); // Timeslice to close zone progress reporter
m_changesTreeModel->SetProvider( nullptr );
m_items.clear();
m_firstRun = false; m_firstRun = false;
} }
// Old model has to be refreshed, GAL normally does not keep updating it // Old model has to be refreshed, GAL normally does not keep updating it
m_reporter->Report( _( "Rebuild connectivity..." ) ); m_reporter->Report( _( "Rebuild connectivity..." ) );
wxSafeYield(); // Timeslice to update UI
m_parentFrame->Compile_Ratsnest( false ); m_parentFrame->Compile_Ratsnest( false );
m_reporter->Report( _( "Check items..." ) ); m_reporter->Report( _( "Check items..." ) );
wxSafeYield(); // Timeslice to update UI
cleaner.CleanupBoard( aDryRun, &m_items, m_cleanShortCircuitOpt->GetValue(), cleaner.CleanupBoard( aDryRun, &m_items, m_cleanShortCircuitOpt->GetValue(),
m_cleanViasOpt->GetValue(), m_cleanViasOpt->GetValue(),
@ -159,6 +155,7 @@ void DIALOG_CLEANUP_TRACKS_AND_VIAS::doCleanup( bool aDryRun )
m_reporter ); m_reporter );
m_reporter->Report( _( "Items checked..." ) ); m_reporter->Report( _( "Items checked..." ) );
wxSafeYield(); // Timeslice to update UI
if( aDryRun ) if( aDryRun )
{ {

103
pcbnew/tracks_cleaner.cpp
View File

@ -62,20 +62,29 @@ void TRACKS_CLEANER::CleanupBoard( bool aDryRun, std::vector<std::shared_ptr<CLE
m_itemsList = aItemsList; m_itemsList = aItemsList;
if( m_reporter ) if( m_reporter )
{
m_reporter->Report( _( "Clean vias and tracks" ) ); m_reporter->Report( _( "Clean vias and tracks" ) );
wxSafeYield(); // Timeslice to update UI
}
bool removeNullSegments = aMergeSegments || aRemoveMisConnected; bool removeNullSegments = aMergeSegments || aRemoveMisConnected;
cleanup( aCleanVias, removeNullSegments, aMergeSegments /* dup segments*/, aMergeSegments ); cleanup( aCleanVias, removeNullSegments, aMergeSegments /* dup segments*/, aMergeSegments );
if( m_reporter ) if( m_reporter )
{
m_reporter->Report( _( "Merge collinear tracks" ) ); m_reporter->Report( _( "Merge collinear tracks" ) );
wxSafeYield(); // Timeslice to update UI
}
cleanup( false, false, true, aMergeSegments ); cleanup( false, false, true, aMergeSegments );
if( aRemoveMisConnected ) if( aRemoveMisConnected )
{ {
if( m_reporter ) if( m_reporter )
{
m_reporter->Report( _( "Remove misconnected" ) ); m_reporter->Report( _( "Remove misconnected" ) );
wxSafeYield(); // Timeslice to update UI
}
removeShortingTrackSegments(); removeShortingTrackSegments();
} }
@ -83,7 +92,10 @@ void TRACKS_CLEANER::CleanupBoard( bool aDryRun, std::vector<std::shared_ptr<CLE
if( aDeleteTracksinPad ) if( aDeleteTracksinPad )
{ {
if( m_reporter ) if( m_reporter )
{
m_reporter->Report( _( "Delete tracks in pads" ) ); m_reporter->Report( _( "Delete tracks in pads" ) );
wxSafeYield(); // Timeslice to update UI
}
deleteTracksInPads(); deleteTracksInPads();
} }
@ -93,7 +105,10 @@ void TRACKS_CLEANER::CleanupBoard( bool aDryRun, std::vector<std::shared_ptr<CLE
if( has_deleted && aMergeSegments ) if( has_deleted && aMergeSegments )
{ {
if( m_reporter ) if( m_reporter )
{
m_reporter->Report( _( "Merge segments" ) ); m_reporter->Report( _( "Merge segments" ) );
wxSafeYield(); // Timeslice to update UI
}
cleanup( false, false, false, true ); cleanup( false, false, false, true );
} }
@ -428,20 +443,25 @@ void TRACKS_CLEANER::cleanup( bool aDeleteDuplicateVias, bool aDeleteNullSegment
{ {
merged = false; merged = false;
m_brd->BuildConnectivity(); m_brd->BuildConnectivity();
auto connectivity = m_brd->GetConnectivity()->GetConnectivityAlgo(); auto connectivity = m_brd->GetConnectivity()->GetConnectivityAlgo();
// Keep a duplicate deque to all deleting in the primary // Keep a duplicate deque to all deleting in the primary
std::deque<PCB_TRACK*> temp_segments( m_brd->Tracks() ); std::deque<PCB_TRACK*> temp_segments( m_brd->Tracks() );
m_connectedItemsCache.clear();
// merge collinear segments: // merge collinear segments:
for( PCB_TRACK* segment : temp_segments ) for( PCB_TRACK* segment : temp_segments )
{ {
if( segment->Type() != PCB_TRACE_T ) // one can merge only track collinear segments, not vias.
// one can merge only collinear segments, not vias or arcs.
if( segment->Type() != PCB_TRACE_T )
continue; continue;
if( segment->HasFlag( IS_DELETED ) ) // already taken in account
if( segment->HasFlag( IS_DELETED ) ) // already taken into account
continue; continue;
// for each end of the segment:
for( CN_ITEM* citem : connectivity->ItemEntry( segment ).GetItems() ) for( CN_ITEM* citem : connectivity->ItemEntry( segment ).GetItems() )
{ {
// Do not merge an end which has different width tracks attached -- it's a // Do not merge an end which has different width tracks attached -- it's a
@ -454,25 +474,34 @@ void TRACKS_CLEANER::cleanup( bool aDeleteDuplicateVias, bool aDeleteNullSegment
if( !connected->Valid() ) if( !connected->Valid() )
continue; continue;
BOARD_CONNECTED_ITEM* candidateItem = connected->Parent();
BOARD_CONNECTED_ITEM* candidate = connected->Parent();
if( candidateItem->Type() == PCB_TRACE_T && !candidateItem->HasFlag( IS_DELETED ) )
if( candidate->Type() == PCB_TRACE_T && !candidate->HasFlag( IS_DELETED ) )
{ {
PCB_TRACK* candidateSegment = static_cast<PCB_TRACK*>( candidateItem );
PCB_TRACK* candidateSegment = static_cast<PCB_TRACK*>( candidate );
if( candidateSegment->GetWidth() == segment->GetWidth() ) if( candidateSegment->GetWidth() == segment->GetWidth() )
{
sameWidthCandidates.push_back( candidateSegment ); sameWidthCandidates.push_back( candidateSegment );
}
else else
{
differentWidthCandidates.push_back( candidateSegment ); differentWidthCandidates.push_back( candidateSegment );
break;
}
} }
} }
if( differentWidthCandidates.size() == 0 )
{
if( !differentWidthCandidates.empty() )
continue;
for( PCB_TRACK* candidate : sameWidthCandidates ) for( PCB_TRACK* candidate : sameWidthCandidates )
{ {
if( segment->ApproxCollinear( *candidate ) )
merged |= mergeCollinearSegments( segment, candidate );
if( segment->ApproxCollinear( *candidate )
&& mergeCollinearSegments( segment, candidate ) )
{
merged = true;
break;
} }
} }
} }
@ -485,36 +514,37 @@ void TRACKS_CLEANER::cleanup( bool aDeleteDuplicateVias, bool aDeleteNullSegment
} }
bool TRACKS_CLEANER::mergeCollinearSegments( PCB_TRACK* aSeg1, PCB_TRACK* aSeg2 )
const std::vector<BOARD_CONNECTED_ITEM*>& TRACKS_CLEANER::getConnectedItems( PCB_TRACK* aTrack )
{ {
if( aSeg1->IsLocked() || aSeg2->IsLocked() )
return false;
const std::shared_ptr<CONNECTIVITY_DATA>& connectivity = m_brd->GetConnectivity();
std::shared_ptr<CONNECTIVITY_DATA> connectivity = m_brd->GetConnectivity();
if( m_connectedItemsCache.count( aTrack ) == 0 )
{
m_connectedItemsCache[ aTrack ] =
connectivity->GetConnectedItems( aTrack, { PCB_TRACE_T, PCB_ARC_T, PCB_VIA_T,
PCB_PAD_T, PCB_ZONE_T } );
}
std::vector<BOARD_CONNECTED_ITEM*> tracks = connectivity->GetConnectedItems( aSeg1,
{ PCB_TRACE_T, PCB_ARC_T, PCB_VIA_T, PCB_PAD_T, PCB_ZONE_T } );
std::vector<BOARD_CONNECTED_ITEM*> tracks2 = connectivity->GetConnectedItems( aSeg2,
{ PCB_TRACE_T, PCB_ARC_T, PCB_VIA_T, PCB_PAD_T, PCB_ZONE_T } );
return m_connectedItemsCache[ aTrack ];
}
std::move( tracks2.begin(), tracks2.end(), std::back_inserter( tracks ) );
std::sort( tracks.begin(), tracks.end() );
tracks.erase( std::unique( tracks.begin(), tracks.end() ), tracks.end() );
tracks.erase(
std::remove_if( tracks.begin(), tracks.end(), [ aSeg1, aSeg2 ]( BOARD_CONNECTED_ITEM* aTest )
{
return ( aTest == aSeg1 ) || ( aTest == aSeg2 );
} ), tracks.end() );
bool TRACKS_CLEANER::mergeCollinearSegments( PCB_TRACK* aSeg1, PCB_TRACK* aSeg2 )
{
if( aSeg1->IsLocked() || aSeg2->IsLocked() )
return false;
// Collect the unique points where the two tracks are connected to other items
std::set<VECTOR2I> pts; std::set<VECTOR2I> pts;
// Collect the unique points where the two tracks are connected to other items
for( BOARD_CONNECTED_ITEM* citem : tracks )
auto collectPts =
[&]( BOARD_CONNECTED_ITEM* citem )
{ {
if( PCB_TRACK* track = dyn_cast<PCB_TRACK*>( citem ) )
if( citem->Type() == PCB_TRACE_T || citem->Type() == PCB_ARC_T
|| citem->Type() == PCB_VIA_T )
{ {
PCB_TRACK* track = static_cast<PCB_TRACK*>( citem );
if( track->IsPointOnEnds( aSeg1->GetStart() ) ) if( track->IsPointOnEnds( aSeg1->GetStart() ) )
pts.emplace( aSeg1->GetStart() ); pts.emplace( aSeg1->GetStart() );
@ -541,8 +571,19 @@ bool TRACKS_CLEANER::mergeCollinearSegments( PCB_TRACK* aSeg1, PCB_TRACK* aSeg2
if( citem->HitTest( aSeg2->GetEnd(), ( aSeg2->GetWidth() + 1 ) / 2 ) ) if( citem->HitTest( aSeg2->GetEnd(), ( aSeg2->GetWidth() + 1 ) / 2 ) )
pts.emplace( aSeg2->GetEnd() ); pts.emplace( aSeg2->GetEnd() );
} }
};
for( BOARD_CONNECTED_ITEM* item : getConnectedItems( aSeg1 ) )
{
if( item != aSeg1 && item != aSeg2 )
collectPts( item );
} }
for( BOARD_CONNECTED_ITEM* item : getConnectedItems( aSeg2 ) )
{
if( item != aSeg1 && item != aSeg2 )
collectPts( item );
}
// This means there is a node in the center // This means there is a node in the center
if( pts.size() > 2 ) if( pts.size() > 2 )
@ -613,10 +654,10 @@ bool TRACKS_CLEANER::mergeCollinearSegments( PCB_TRACK* aSeg1, PCB_TRACK* aSeg2
m_commit.Modify( aSeg1 ); m_commit.Modify( aSeg1 );
*aSeg1 = dummy_seg; *aSeg1 = dummy_seg;
connectivity->Update( aSeg1 );
m_brd->GetConnectivity()->Update( aSeg1 );
// Clear the status flags here after update. // Clear the status flags here after update.
for( auto pad : connectivity->GetConnectedPads( aSeg1 ) )
for( PAD* pad : m_brd->GetConnectivity()->GetConnectedPads( aSeg1 ) )
{ {
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() ) );

5
pcbnew/tracks_cleaner.h
View File

@ -98,12 +98,17 @@ private:
void removeItems( std::set<BOARD_ITEM*>& aItems ); void removeItems( std::set<BOARD_ITEM*>& aItems );
const std::vector<BOARD_CONNECTED_ITEM*>& getConnectedItems( PCB_TRACK* aTrack );
private: private:
BOARD* m_brd; BOARD* m_brd;
BOARD_COMMIT& m_commit; // caller owns BOARD_COMMIT& m_commit; // caller owns
bool m_dryRun; bool m_dryRun;
std::vector<std::shared_ptr<CLEANUP_ITEM>>* m_itemsList; // caller owns std::vector<std::shared_ptr<CLEANUP_ITEM>>* m_itemsList; // caller owns
REPORTER* m_reporter; REPORTER* m_reporter;
// Cache connections. O(n^2) is awful, but it beats O(2n^3).
std::map<PCB_TRACK*, std::vector<BOARD_CONNECTED_ITEM*>> m_connectedItemsCache;
}; };

Write Preview
Loading…
Cancel
Save