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

Revert the SHAPE_ARC::Collide() part. 

The arc width appears to be handled elsewhere (at least in
the test suite).

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16951
This commit is contained in:
Jeff Young 2024-02-12 17:49:59 +00:00
parent c6c1dbb844
commit 11f5908761
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/kimath/src/geometry/shape_arc.cpp
View File

@ -244,7 +244,6 @@ bool SHAPE_ARC::Collide( const SEG& aSeg, int aClearance, int* aActual, VECTOR2I
if( aSeg.A == aSeg.B )
return Collide( aSeg.A, aClearance, aActual, aLocation );
int minDist = aClearance + m_width / 2;
VECTOR2I center = GetCenter();
CIRCLE circle( center, GetRadius() );
@ -264,7 +263,7 @@ bool SHAPE_ARC::Collide( const SEG& aSeg, int aClearance, int* aActual, VECTOR2I
for( const VECTOR2I& candidate : candidatePts )
{
if( Collide( candidate, minDist, aActual, aLocation ) )
if( Collide( candidate, aClearance, aActual, aLocation ) )
return true;
}