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

Tighten the bicolored routine 

Eliminates some duplicate code into a lambda
This commit is contained in:
Seth Hillbrand 2020-06-23 16:48:24 -07:00
parent e8fc421a39
commit 141bf4f579
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pcbnew/ratsnest/ratsnest_data.cpp
View File

@ -424,6 +424,19 @@ bool RN_NET::NearestBicoloredPair( const RN_NET& aOtherNet, CN_ANCHOR_PTR& aNode
VECTOR2I::extended_type distMax = VECTOR2I::ECOORD_MAX; VECTOR2I::extended_type distMax = VECTOR2I::ECOORD_MAX;
auto verify = [&]( auto& aTestNode1, auto& aTestNode2 )
{
auto squaredDist = ( aTestNode1->Pos() - aTestNode2->Pos() ).SquaredEuclideanNorm();
if( squaredDist < distMax )
{
rv = true;
distMax = squaredDist;
aNode1 = aTestNode1;
aNode2 = aTestNode2;
}
};
for( const auto& nodeA : aOtherNet.m_nodes ) for( const auto& nodeA : aOtherNet.m_nodes )
{ {
if( nodeA->GetNoLine() ) if( nodeA->GetNoLine() )
@ -444,18 +457,13 @@ bool RN_NET::NearestBicoloredPair( const RN_NET& aOtherNet, CN_ANCHOR_PTR& aNode
if( distX * distX > distMax ) if( distX * distX > distMax )
break; break;
auto squaredDist = ( nodeA->Pos() - nodeB->Pos() ).SquaredEuclideanNorm(); verify( nodeA, nodeB );
if( squaredDist < distMax )
{
rv = true;
distMax = squaredDist;
aNode1 = nodeA;
aNode2 = nodeB;
}
} }
for( ++rev_it; rev_it != m_nodes.rend(); ++rev_it ) if( rev_it != m_nodes.rend() )
++rev_it;
for( ; rev_it != m_nodes.rend(); ++rev_it )
{ {
auto nodeB = *rev_it; auto nodeB = *rev_it;
@ -467,15 +475,7 @@ bool RN_NET::NearestBicoloredPair( const RN_NET& aOtherNet, CN_ANCHOR_PTR& aNode
if( distX * distX > distMax ) if( distX * distX > distMax )
break; break;
auto squaredDist = ( nodeA->Pos() - nodeB->Pos() ).SquaredEuclideanNorm(); verify( nodeA, nodeB );
if( squaredDist < distMax )
{
rv = true;
distMax = squaredDist;
aNode1 = nodeA;
aNode2 = nodeB;
}
} }
} }