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

Minor improvements to formatting & SNR.

This commit is contained in:
Jeff Young 2021-01-07 12:13:03 +00:00
parent cdd4953589
commit f702b64b8d
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pcbnew/router/pns_node.cpp
View File

@ -1267,24 +1267,24 @@ void NODE::releaseGarbage()
void NODE::Commit( NODE* aNode ) void NODE::Commit( NODE* aNode )
{
if( aNode->isRoot() )
return;
for( ITEM* item : aNode->m_override )
Remove( item );
for( ITEM* item : *aNode->m_index )
{ {
if( aNode->isRoot() ) item->SetRank( -1 );
return; item->Unmark();
Add( std::unique_ptr<ITEM>( item ) );
for( ITEM* item : aNode->m_override )
Remove( item );
for( auto i : *aNode->m_index )
{
i->SetRank( -1 );
i->Unmark();
Add( std::unique_ptr<ITEM>( i ) );
}
releaseChildren();
releaseGarbage();
} }
releaseChildren();
releaseGarbage();
}
void NODE::KillChildren() void NODE::KillChildren()
{ {
@ -1298,9 +1298,11 @@ void NODE::AllItemsInNet( int aNet, std::set<ITEM*>& aItems, int aKindMask)
if( l_cur ) if( l_cur )
{ {
for( ITEM*item : *l_cur ) for( ITEM* item : *l_cur )
{
if( item->OfKind( aKindMask ) ) if( item->OfKind( aKindMask ) )
aItems.insert( item ); aItems.insert( item );
}
} }
if( !isRoot() ) if( !isRoot() )
@ -1309,10 +1311,10 @@ void NODE::AllItemsInNet( int aNet, std::set<ITEM*>& aItems, int aKindMask)
if( l_root ) if( l_root )
{ {
for( INDEX::NET_ITEMS_LIST::iterator i = l_root->begin(); i != l_root->end(); ++i ) for( ITEM* item : *l_root )
{ {
if( !Overrides( *i ) && (*i)->OfKind( aKindMask ) ) if( !Overrides( item ) && item->OfKind( aKindMask ) )
aItems.insert( *i ); aItems.insert( item );
} }
} }
} }
@ -1321,10 +1323,10 @@ void NODE::AllItemsInNet( int aNet, std::set<ITEM*>& aItems, int aKindMask)
void NODE::ClearRanks( int aMarkerMask ) void NODE::ClearRanks( int aMarkerMask )
{ {
for( INDEX::ITEM_SET::iterator i = m_index->begin(); i != m_index->end(); ++i ) for( ITEM* item : *m_index )
{ {
(*i)->SetRank( -1 ); item->SetRank( -1 );
(*i)->Mark( (*i)->Marker() & (~aMarkerMask) ); item->Mark( item->Marker() & ~aMarkerMask );
} }
} }
@ -1343,6 +1345,7 @@ void NODE::RemoveByMarker( int aMarker )
Remove( item ); Remove( item );
} }
SEGMENT* NODE::findRedundantSegment( const VECTOR2I& A, const VECTOR2I& B, const LAYER_RANGE& lr, SEGMENT* NODE::findRedundantSegment( const VECTOR2I& A, const VECTOR2I& B, const LAYER_RANGE& lr,
int aNet ) int aNet )
{ {
@ -1371,11 +1374,13 @@ SEGMENT* NODE::findRedundantSegment( const VECTOR2I& A, const VECTOR2I& B, const
return nullptr; return nullptr;
} }
SEGMENT* NODE::findRedundantSegment( SEGMENT* aSeg ) SEGMENT* NODE::findRedundantSegment( SEGMENT* aSeg )
{ {
return findRedundantSegment( aSeg->Seg().A, aSeg->Seg().B, aSeg->Layers(), aSeg->Net() ); return findRedundantSegment( aSeg->Seg().A, aSeg->Seg().B, aSeg->Layers(), aSeg->Net() );
} }
ARC* NODE::findRedundantArc( const VECTOR2I& A, const VECTOR2I& B, const LAYER_RANGE& lr, ARC* NODE::findRedundantArc( const VECTOR2I& A, const VECTOR2I& B, const LAYER_RANGE& lr,
int aNet ) int aNet )
{ {
@ -1404,6 +1409,7 @@ ARC* NODE::findRedundantArc( const VECTOR2I& A, const VECTOR2I& B, const LAYER_R
return nullptr; return nullptr;
} }
ARC* NODE::findRedundantArc( ARC* aArc ) ARC* NODE::findRedundantArc( ARC* aArc )
{ {
return findRedundantArc( aArc->Anchor( 0 ), aArc->Anchor( 1 ), aArc->Layers(), aArc->Net() ); return findRedundantArc( aArc->Anchor( 0 ), aArc->Anchor( 1 ), aArc->Layers(), aArc->Net() );