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

Fix bug in TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist ), when aDist = 0. (fix Bug #1106744 )

This commit is contained in:
jean-pierre charras 2013-01-27 11:06:09 +01:00
parent 78a8be0e8e
commit 8fb8b4335a
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/trigo.cpp
View File

@ -37,14 +37,14 @@ bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist
// vertical segment // vertical segment
int ll = abs( aRefPoint.x - aStart.x ); int ll = abs( aRefPoint.x - aStart.x );
if( ll >= aDist ) if( ll > aDist )
return false; return false;
// To have only one case to examine, ensure aEnd.y > aStart.y // To have only one case to examine, ensure aEnd.y > aStart.y
if( aEnd.y < aStart.y ) if( aEnd.y < aStart.y )
EXCHG( aStart.y, aEnd.y ); EXCHG( aStart.y, aEnd.y );
if( aRefPoint.y < aEnd.y && aRefPoint.y > aStart.y ) if( aRefPoint.y <= aEnd.y && aRefPoint.y >= aStart.y )
return true; return true;
// there is a special case: x,y near an end point (distance < dist ) // there is a special case: x,y near an end point (distance < dist )
@ -53,7 +53,7 @@ bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist
{ {
double dd = square( aRefPoint.x - aStart.x) + double dd = square( aRefPoint.x - aStart.x) +
square( aRefPoint.y - aStart.y ); square( aRefPoint.y - aStart.y );
if( dd < square( aDist ) ) if( dd <= square( aDist ) )
return true; return true;
} }
@ -61,7 +61,7 @@ bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist
{ {
double dd = square( aRefPoint.x - aEnd.x ) + double dd = square( aRefPoint.x - aEnd.x ) +
square( aRefPoint.y - aEnd.y ); square( aRefPoint.y - aEnd.y );
if( dd < square( aDist ) ) if( dd <= square( aDist ) )
return true; return true;
} }
} }
@ -70,31 +70,31 @@ bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist
// horizontal segment // horizontal segment
int ll = abs( aRefPoint.y - aStart.y ); int ll = abs( aRefPoint.y - aStart.y );
if( ll >= aDist ) if( ll > aDist )
return false; return false;
// To have only one case to examine, ensure xf > xi // To have only one case to examine, ensure xf > xi
if( aEnd.x < aStart.x ) if( aEnd.x < aStart.x )
EXCHG( aStart.x, aEnd.x ); EXCHG( aStart.x, aEnd.x );
if( aRefPoint.x < aEnd.x && aRefPoint.x > aStart.x ) if( aRefPoint.x <= aEnd.x && aRefPoint.x >= aStart.x )
return true; return true;
// there is a special case: x,y near an end point (distance < dist ) // there is a special case: x,y near an end point (distance < dist )
// the distance should be carefully calculated // the distance should be carefully calculated
if( (aStart.x - aRefPoint.x) < aDist ) if( (aStart.x - aRefPoint.x) <= aDist )
{ {
double dd = square( aRefPoint.x - aStart.x) + double dd = square( aRefPoint.x - aStart.x) +
square( aRefPoint.y - aStart.y ); square( aRefPoint.y - aStart.y );
if( dd < square( aDist ) ) if( dd <= square( aDist ) )
return true; return true;
} }
if( (aRefPoint.x - aEnd.x) < aDist ) if( (aRefPoint.x - aEnd.x) <= aDist )
{ {
double dd = square(aRefPoint.x - aEnd.x) + double dd = square(aRefPoint.x - aEnd.x) +
square( aRefPoint.y - aEnd.y); square( aRefPoint.y - aEnd.y);
if( dd < square( aDist ) ) if( dd <= square( aDist ) )
return true; return true;
} }
} }
@ -122,22 +122,22 @@ bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist
double dd = square( aRefPoint.x - xp ) + square( aRefPoint.y - yp ); double dd = square( aRefPoint.x - xp ) + square( aRefPoint.y - yp );
double dist = square( aDist ); double dist = square( aDist );
if( dd >= dist ) // this reference point is not a good candiadte. if( dd > dist ) // this reference point is not a good candiadte.
return false; return false;
// dd is < dist, therefore we should make a fine test // dd is < dist, therefore we should make a fine test
if( fabs( slope ) > 0.7 ) if( fabs( slope ) > 0.7 )
{ {
// line segment more vertical than horizontal // line segment more vertical than horizontal
if( (aEnd.y > aStart.y && yp < aEnd.y && yp > aStart.y) || if( (aEnd.y > aStart.y && yp <= aEnd.y && yp >= aStart.y) ||
(aEnd.y < aStart.y && yp > aEnd.y && yp < aStart.y) ) (aEnd.y < aStart.y && yp >= aEnd.y && yp <= aStart.y) )
return true; return true;
} }
else else
{ {
// line segment more horizontal than vertical // line segment more horizontal than vertical
if( (aEnd.x > aStart.x && xp < aEnd.x && xp > aStart.x) || if( (aEnd.x > aStart.x && xp <= aEnd.x && xp >= aStart.x) ||
(aEnd.x < aStart.x && xp > aEnd.x && xp < aStart.x) ) (aEnd.x < aStart.x && xp >= aEnd.x && xp <= aStart.x) )
return true; return true;
} }
@ -146,10 +146,10 @@ bool TestSegmentHit( wxPoint aRefPoint, wxPoint aStart, wxPoint aEnd, int aDist
// It is "outside" the segment, but it could be near a segment end point // It is "outside" the segment, but it could be near a segment end point
// Therefore, we test the dist from the test point to each segment end point // Therefore, we test the dist from the test point to each segment end point
dd = square( aRefPoint.x - aEnd.x ) + square( aRefPoint.y - aEnd.y ); dd = square( aRefPoint.x - aEnd.x ) + square( aRefPoint.y - aEnd.y );
if( dd < dist ) if( dd <= dist )
return true; return true;
dd = square( aRefPoint.x - aStart.x ) + square( aRefPoint.y - aStart.y ); dd = square( aRefPoint.x - aStart.x ) + square( aRefPoint.y - aStart.y );
if( dd < dist ) if( dd <= dist )
return true; return true;
} }