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

Minor fix to SEG class.

This commit is contained in:
Maciej Suminski 2014-03-12 10:05:09 +01:00
parent d2ed2efc85
commit 66fcb84f92
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/geometry/seg.h
View File

@ -46,7 +46,8 @@ public:
* to an object the segment belongs to (e.g. a line chain) or references to locally stored * to an object the segment belongs to (e.g. a line chain) or references to locally stored
* points (m_a, m_b). * points (m_a, m_b).
*/ */
VECTOR2I& A, B; VECTOR2I& A;
VECTOR2I& B;
/** Default constructor /** Default constructor
* Creates an empty (0, 0) segment, locally-referenced * Creates an empty (0, 0) segment, locally-referenced
@ -203,6 +204,8 @@ public:
bool Collide( const SEG& aSeg, int aClearance ) const; bool Collide( const SEG& aSeg, int aClearance ) const;
ecoord SquaredDistance( const SEG& aSeg ) const;
/** /**
* Function Distance() * Function Distance()
* *
@ -210,14 +213,16 @@ public:
* @param aSeg other segment * @param aSeg other segment
* @return minimum distance * @return minimum distance
*/ */
ecoord SquaredDistance( const SEG& aSeg ) const;
int Distance( const SEG& aSeg ) const int Distance( const SEG& aSeg ) const
{ {
return sqrt( SquaredDistance( aSeg ) ); return sqrt( SquaredDistance( aSeg ) );
} }
ecoord SquaredDistance( const VECTOR2I& aP ) const
{
return ( NearestPoint( aP ) - aP ).SquaredEuclideanNorm();
}
/** /**
* Function Distance() * Function Distance()
* *
@ -225,11 +230,6 @@ public:
* @param aP the point * @param aP the point
* @return minimum distance * @return minimum distance
*/ */
ecoord SquaredDistance( const VECTOR2I& aP ) const
{
return ( NearestPoint( aP ) - aP ).SquaredEuclideanNorm();
}
int Distance( const VECTOR2I& aP ) const int Distance( const VECTOR2I& aP ) const
{ {
return sqrt( SquaredDistance( aP ) ); return sqrt( SquaredDistance( aP ) );