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

Avoid calculating on-endpoint hits 

When hitting on a start/end point the arc may incorrectly be assigned as
not-connected when the angle does not wrap around from 0-360

Fixes https://gitlab.com/kicad/code/kicad/issues/6380

Fixes https://gitlab.com/kicad/code/kicad/issues/6380
This commit is contained in:
Seth Hillbrand 2020-11-19 14:32:54 -08:00
parent 9e9946628a
commit 4e36036435
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/track.cpp
View File

@ -782,6 +782,14 @@ bool TRACK::HitTest( const wxPoint& aPosition, int aAccuracy ) const
bool ARC::HitTest( const wxPoint& aPosition, int aAccuracy ) const
{
int max_dist = aAccuracy + ( m_Width / 2 );
// Short-circuit common cases where the arc is connected to a track or via at an endpoint
if( EuclideanNorm( GetStart() - aPosition ) <= max_dist ||
EuclideanNorm( GetEnd() - aPosition ) <= max_dist )
{
return true;
}
wxPoint center = GetPosition();
wxPoint relpos = aPosition - center;
double dist = EuclideanNorm( relpos );
@ -803,7 +811,7 @@ bool ARC::HitTest( const wxPoint& aPosition, int aAccuracy ) const
if( arc_angle < 0 )
return arc_hittest >= 3600 + arc_angle;
return arc_hittest <= GetAngle();
return arc_hittest <= arc_angle;
}