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

Use a standard SHAPE_POLY_SET hittest for pads. 

Fixes https://gitlab.com/kicad/code/kicad/issues/8705
This commit is contained in:
Jeff Young 2021-06-30 22:35:48 +01:00
parent 00504368d6
commit e9c0920be2
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pcbnew/pad.cpp
View File

@ -968,40 +968,43 @@ bool PAD::HitTest( const wxPoint& aPosition, int aAccuracy ) const
bool PAD::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const bool PAD::HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const
{ {
auto getArea = []( const SHAPE_POLY_SET& aPoly ) -> double
{
return aPoly.OutlineCount() ? aPoly.COutline( 0 ).Area() : 0;
};
EDA_RECT arect = aRect; EDA_RECT arect = aRect;
arect.Normalize(); arect.Normalize();
arect.Inflate( aAccuracy ); arect.Inflate( aAccuracy );
EDA_RECT bbox = GetBoundingBox(); EDA_RECT bbox = GetBoundingBox();
if( !arect.Intersects( bbox ) ) if( aContained )
return false; {
return arect.Contains( bbox );
// This covers total containment for all test cases }
if( arect.Contains( bbox ) )
return true;
SHAPE_POLY_SET selRect;
selRect.NewOutline();
selRect.Append( arect.GetOrigin() );
selRect.Append( VECTOR2I( arect.GetRight(), arect.GetTop() ) );
selRect.Append( VECTOR2I( arect.GetRight(), arect.GetBottom() ) );
selRect.Append( VECTOR2I( arect.GetLeft(), arect.GetBottom() ) );
selRect.BooleanIntersection( *GetEffectivePolygon(), SHAPE_POLY_SET::PM_FAST );
double padArea = getArea( *GetEffectivePolygon() );
double intersection = getArea( selRect );
if( intersection > ( padArea * 0.99 ) )
return true;
else else
return !aContained && intersection > 0; {
// Fast test: if aRect is outside the polygon bounding box,
// rectangles cannot intersect
if( !arect.Intersects( bbox ) )
return false;
const std::shared_ptr<SHAPE_POLY_SET>& poly = GetEffectivePolygon();
int count = poly->TotalVertices();
for( int ii = 0; ii < count; ii++ )
{
auto vertex = poly->CVertex( ii );
auto vertexNext = poly->CVertex(( ii + 1 ) % count );
// Test if the point is within aRect
if( arect.Contains( ( wxPoint ) vertex ) )
return true;
// Test if this edge intersects aRect
if( arect.Intersects( ( wxPoint ) vertex, ( wxPoint ) vertexNext ) )
return true;
}
return false;
}
} }