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

Allow router cursor snapping to points on the arc. 

Also don't disable grid snapping when holding Shift over arcs.
This commit is contained in:
Alex 2022-11-20 03:54:11 +05:00
parent 110bc6abd1
commit dd2f19ca5f
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pcbnew/tools/pcb_grid_helper.cpp
View File

@ -133,17 +133,22 @@ VECTOR2I PCB_GRID_HELPER::AlignToSegment( const VECTOR2I& aPoint, const SEG& aSe
VECTOR2I PCB_GRID_HELPER::AlignToArc( const VECTOR2I& aPoint, const SHAPE_ARC& aArc ) VECTOR2I PCB_GRID_HELPER::AlignToArc( const VECTOR2I& aPoint, const SHAPE_ARC& aArc )
{ {
VECTOR2I aligned = Align( aPoint );
if( !m_enableSnap ) if( !m_enableSnap )
return aPoint; return aligned;
const VECTOR2D gridOffset( GetOrigin() ); std::vector<VECTOR2I> points;
const VECTOR2D gridSize( GetGrid() );
VECTOR2I nearest( KiROUND( ( aPoint.x - gridOffset.x ) / gridSize.x ) * gridSize.x + gridOffset.x, aArc.IntersectLine( SEG( aligned, aligned + VECTOR2( 1, 0 ) ), &points );
KiROUND( ( aPoint.y - gridOffset.y ) / gridSize.y ) * gridSize.y + gridOffset.y ); aArc.IntersectLine( SEG( aligned, aligned + VECTOR2( 0, 1 ) ), &points );
aArc.IntersectLine( SEG( aligned, aligned + VECTOR2( 1, 1 ) ), &points );
aArc.IntersectLine( SEG( aligned, aligned + VECTOR2( 1, -1 ) ), &points );
int min_d = std::numeric_limits<int>::max(); VECTOR2I nearest = aligned;
int min_d = std::numeric_limits<int>::max();
// Snap by distance between pointer and endpoints
for( const VECTOR2I& pt : { aArc.GetP0(), aArc.GetP1() } ) for( const VECTOR2I& pt : { aArc.GetP0(), aArc.GetP1() } )
{ {
int d = ( pt - aPoint ).EuclideanNorm(); int d = ( pt - aPoint ).EuclideanNorm();
@ -153,8 +158,18 @@ VECTOR2I PCB_GRID_HELPER::AlignToArc( const VECTOR2I& aPoint, const SHAPE_ARC& a
min_d = d; min_d = d;
nearest = pt; nearest = pt;
} }
else }
break;
// Snap by distance between aligned cursor and intersections
for( const VECTOR2I& pt : points )
{
int d = ( pt - aligned ).EuclideanNorm();
if( d < min_d )
{
min_d = d;
nearest = pt;
}
} }
return nearest; return nearest;