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

Make segment contain its edge 

This allows segment snapping along its diagonals to the grid.

Fixes https://gitlab.com/kicad/code/kicad/issues/6924
This commit is contained in:
Seth Hillbrand 2021-01-03 12:46:20 -08:00
parent d1f782717e
commit 5a97764319
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/kimath/src/geometry/seg.cpp
View File

@ -49,7 +49,7 @@ SEG::ecoord SEG::SquaredDistance( const SEG& aSeg ) const
}; };
ecoord m = VECTOR2I::ECOORD_MAX; ecoord m = VECTOR2I::ECOORD_MAX;
for( int i = 0; i < 4; i++ ) for( int i = 0; i < 4; i++ )
{ {
m = std::min( m, pts[i].SquaredEuclideanNorm() ); m = std::min( m, pts[i].SquaredEuclideanNorm() );
@ -90,7 +90,7 @@ const VECTOR2I SEG::NearestPoint( const SEG& aSeg ) const
}; };
int min_i = 0; int min_i = 0;
for( int i = 0; i < 4; i++ ) for( int i = 0; i < 4; i++ )
{ {
if( pts_dist[i] < pts_dist[min_i] ) if( pts_dist[i] < pts_dist[min_i] )
@ -170,5 +170,5 @@ bool SEG::Collide( const SEG& aSeg, int aClearance, int* aActual ) const
bool SEG::Contains( const VECTOR2I& aP ) const bool SEG::Contains( const VECTOR2I& aP ) const
{ {
return SquaredDistance( aP ) < 1; // 1 * 1 to be pedantic return SquaredDistance( aP ) <= 1; // 1 * 1 to be pedantic
} }