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

SHAPE_LINE_CHAIN: Only fix up arc indices if last pt is part of an arc 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/9843
This commit is contained in:
Roberto Fernandez Bautista 2021-12-03 18:26:50 +00:00
parent cb482eb8eb
commit c463818b57
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/kimath/src/geometry/shape_line_chain.cpp
View File

@ -157,8 +157,11 @@ void SHAPE_LINE_CHAIN::mergeFirstLastPointIfNeeded()
{
if( m_points.size() > 1 && m_points.front() == m_points.back() )
{
m_shapes.front().second = m_shapes.front().first;
m_shapes.front().first = m_shapes.back().first;
if( m_shapes.back() != SHAPES_ARE_PT )
{
m_shapes.front().second = m_shapes.front().first;
m_shapes.front().first = m_shapes.back().first;
}
m_points.pop_back();
m_shapes.pop_back();

25
qa/libs/kimath/geometry/test_shape_line_chain.cpp
View File

@ -111,9 +111,32 @@ BOOST_AUTO_TEST_CASE( ArcToPolylineLargeCoords )
BOOST_CHECK_EQUAL( base_chain.Area(), areaPriorToArcRemoval ); // Area should not have changed
}
// Test that duplicate point gets removed when line is set to be closed
BOOST_AUTO_TEST_CASE( SetClosedDuplicatePoint )
{
// Test from issue #9843
SHAPE_LINE_CHAIN chain;
chain.Append(
SHAPE_ARC( { -859598, 2559876 }, { -1632771, 1022403 }, { -3170244, 249230 }, 0 ) );
chain.Append(
SHAPE_ARC( { -3170244, -1657832 }, { -292804, -317564 }, { 1047464, 2559876 }, 0 ) );
chain.Append( VECTOR2I( -859598, 2559876 ) ); // add point that is equal to first arc start
BOOST_CHECK( GEOM_TEST::IsOutlineValid( chain ) );
BOOST_CHECK_EQUAL( chain.PointCount(), 31 );
// CLOSED CHAIN
chain.SetClosed( true );
BOOST_CHECK_EQUAL( chain.PointCount(), 30 ); // (-1) should have removed coincident points
BOOST_CHECK( GEOM_TEST::IsOutlineValid( chain ) );
}
// Test special case where the last arc in the chain has a shared point with the first arc
BOOST_AUTO_TEST_CASE( ArcWrappingToStart )
BOOST_AUTO_TEST_CASE( ArcWrappingToStartSharedPoints )
{
// represent a circle with two semicircular arcs
SHAPE_ARC arc1( VECTOR2I( 100000, 0 ), VECTOR2I( 0, 100000 ), VECTOR2I( -100000, 0 ), 0 );