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

Fix logic error in polyline hittesting. 

Fixes https://gitlab.com/kicad/code/kicad/issues/9030
This commit is contained in:
Jeff Young 2021-09-01 21:38:13 +01:00
parent 651981b2a0
commit 243631a095
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eeschema/lib_polyline.cpp
View File

@ -256,21 +256,30 @@ bool LIB_POLYLINE::HitTest( const EDA_RECT& aRect, bool aContained, int aAccurac
// Account for the width of the line // Account for the width of the line
sel.Inflate( ( GetPenWidth() / 2 ) + 1 ); sel.Inflate( ( GetPenWidth() / 2 ) + 1 );
// Only test closing segment if the polyline is filled for( size_t ii = 0; ii < m_PolyPoints.size(); ii++ )
int count = m_fill == FILL_TYPE::NO_FILL ? m_PolyPoints.size() - 1 : m_PolyPoints.size();
for( int ii = 0; ii < count; ii++ )
{ {
wxPoint pt = DefaultTransform.TransformCoordinate( m_PolyPoints[ ii ] ); wxPoint pt = DefaultTransform.TransformCoordinate( m_PolyPoints[ ii ] );
wxPoint ptNext = DefaultTransform.TransformCoordinate( m_PolyPoints[ (ii+1) % count ] );
// Test if the point is within aRect // Test if the point is within aRect
if( sel.Contains( pt ) ) if( sel.Contains( pt ) )
return true; return true;
// Test if this edge intersects aRect if( ii + 1 < m_PolyPoints.size() )
if( sel.Intersects( pt, ptNext ) ) {
return true; wxPoint ptNext = DefaultTransform.TransformCoordinate( m_PolyPoints[ ii + 1 ] );
// Test if this edge intersects aRect
if( sel.Intersects( pt, ptNext ) )
return true;
}
else if( m_fill != FILL_TYPE::NO_FILL )
{
wxPoint ptNext = DefaultTransform.TransformCoordinate( m_PolyPoints[ 0 ] );
// Test if this edge intersects aRect
if( sel.Intersects( pt, ptNext ) )
return true;
}
} }
return false; return false;