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

Selection tool fix to enable selecting overlapping items 

Fixes: lp:1499022
* https://bugs.launchpad.net/kicad/+bug/1499022
This commit is contained in:
Maciej Suminski 2016-09-15 13:24:58 +02:00
parent 83ed3c933e
commit 8590809c7a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcbnew/tools/selection_tool.cpp
View File

@ -1142,8 +1142,9 @@ double calcRatio( double a, double b )
{ {
if( a == 0.0 && b == 0.0 ) if( a == 0.0 && b == 0.0 )
return 1.0; return 1.0;
if( b == 0.0 ) if( b == 0.0 )
return 10000000.0; // something arbitrarily big for the moment return std::numeric_limits<double>::max();
return a / b; return a / b;
} }
@ -1317,6 +1318,7 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector ) c
double maxLength = 0.0; double maxLength = 0.0;
double minLength = std::numeric_limits<double>::max(); double minLength = std::numeric_limits<double>::max();
double maxArea = 0.0; double maxArea = 0.0;
const TRACK* maxTrack = nullptr;
for( int i = 0; i < aCollector.GetCount(); ++i ) for( int i = 0; i < aCollector.GetCount(); ++i )
{ {
@ -1325,10 +1327,15 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector ) c
maxLength = std::max( track->GetLength(), maxLength ); maxLength = std::max( track->GetLength(), maxLength );
maxLength = std::max( (double) track->GetWidth(), maxLength ); maxLength = std::max( (double) track->GetWidth(), maxLength );
minLength = std::min( std::max( track->GetLength(), (double)track->GetWidth() ), minLength ); minLength = std::min( std::max( track->GetLength(), (double) track->GetWidth() ), minLength );
double area = ( track->GetLength() + track->GetWidth() * track->GetWidth() ); double area = track->GetLength() * track->GetWidth();
maxArea = std::max(area, maxArea);
if( area > maxArea )
{
maxArea = area;
maxTrack = track;
}
} }
} }
@ -1350,9 +1357,9 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector ) c
{ {
if( MODULE* mod = dyn_cast<MODULE*>( aCollector[j] ) ) if( MODULE* mod = dyn_cast<MODULE*>( aCollector[j] ) )
{ {
double ratio = maxArea / mod->GetFootprintRect().GetArea(); double ratio = calcRatio( maxArea, mod->GetFootprintRect().GetArea() );
if( ratio < modulePadMinCoverRatio ) if( ratio < modulePadMinCoverRatio && calcCommonArea( maxTrack, mod ) < commonAreaRatio )
rejected.insert( mod ); rejected.insert( mod );
} }
} }