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

Avoid nonsensical intersections 

When two segments are approximately parallel, we shouldn't look to find
their intersection.  It will never be the nearest point and it overflows
the KiROUND call

Fixes https://gitlab.com/kicad/code/kicad/issues/8858
This commit is contained in:
Seth Hillbrand 2021-07-26 09:01:22 -07:00
parent 8921eef0be
commit cb917e4c42
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pcbnew/tools/pcb_grid_helper.cpp
View File

@ -88,14 +88,22 @@ VECTOR2I PCB_GRID_HELPER::AlignToSegment( const VECTOR2I& aPoint, const SEG& aSe
VECTOR2I nearest = Align( aPoint ); VECTOR2I nearest = Align( aPoint );
SEG pos_slope( nearest + VECTOR2I( -1, 1 ), nearest + VECTOR2I( 1, -1 ) );
SEG neg_slope( nearest + VECTOR2I( -1, -1 ), nearest + VECTOR2I( 1, 1 ) );
int max_i = 2;
pts[0] = aSeg.A; pts[0] = aSeg.A;
pts[1] = aSeg.B; pts[1] = aSeg.B;
pts[2] = aSeg.IntersectLines( SEG( nearest + VECTOR2I( -1, 1 ), nearest + VECTOR2I( 1, -1 ) ) );
pts[3] = aSeg.IntersectLines( SEG( nearest + VECTOR2I( -1, -1 ), nearest + VECTOR2I( 1, 1 ) ) ); if( !aSeg.ApproxParallel( pos_slope ) )
pts[max_i++] = aSeg.IntersectLines( pos_slope );
if( !aSeg.ApproxParallel( neg_slope ) )
pts[max_i++] = aSeg.IntersectLines( neg_slope );
int min_d = std::numeric_limits<int>::max(); int min_d = std::numeric_limits<int>::max();
for( int i = 0; i < 4; i++ ) for( int i = 0; i < max_i; i++ )
{ {
if( pts[i] && aSeg.Distance( *pts[i] ) <= c_gridSnapEpsilon ) if( pts[i] && aSeg.Distance( *pts[i] ) <= c_gridSnapEpsilon )
{ {