Add qa test for SHAPE_POLY_SET::Simplify()

qa/libs/kimath/CMakeLists.txt

@@ -32,6 +32,7 @@ set( KIMATH_SRCS
     geometry/test_segment.cpp
     geometry/test_shape_compound_collision.cpp
     geometry/test_shape_arc.cpp
+    geometry/test_shape_poly_set_arcs.cpp
     geometry/test_shape_poly_set_collision.cpp
     geometry/test_shape_poly_set_distance.cpp
     geometry/test_shape_poly_set_iterator.cpp

qa/libs/kimath/geometry/fixtures_geometry.h

@@ -46,6 +46,10 @@ struct CommonTestData
     SHAPE_POLY_SET uniqueVertexPolySet;
     SHAPE_POLY_SET solidPolySet;
     SHAPE_POLY_SET holeyPolySet;
+    SHAPE_POLY_SET holeyCurvedPolySingle; ///< Polygon with a single outline + multiple holes.
+                                          ///< Holes and outline contain arcs
+    SHAPE_POLY_SET holeyCurvedPolyMulti;  ///< Polygon with a multiple outlines + multiple holes.
+                                          ///< Holes and outlines contain arcs
 
     // Vectors containing the information with which the polygons are populated.
     std::vector<VECTOR2I> uniquePoints;
@@ -138,6 +142,55 @@ struct CommonTestData
 
         hole.SetClosed( true );
         holeyPolySet.AddHole( hole );
+
+
+        // GENERATE CURVED POLYGON WITH HOLES
+        // For visualisation, launch test_pns with the arguments "viewcurvedpoly -[single|multi]"
+
+        // First shape:
+        SHAPE_LINE_CHAIN oline0;
+        oline0.Append( { 244000, 180000 } );
+        oline0.Append( SHAPE_ARC( { 582000, 232000 }, { 614000, 354000 }, { 450000, 436000 }, 0 ) );
+        oline0.Append( SHAPE_ARC( { 450000, 436000 }, { 310000, 480000 }, { 502000, 614000 }, 0 ) );
+        oline0.Append( { 872000, 202000 } );
+        oline0.SetClosed( true );
+        holeyCurvedPolySingle.AddOutline( oline0 );
+
+        SHAPE_LINE_CHAIN o0h1;
+        o0h1.Append( { 370000, 482000 } );
+        o0h1.Append( SHAPE_ARC( { 342000, 576000 }, { 436000, 552000 }, { 474000, 622000 }, 0 ) );
+        o0h1.Append( SHAPE_ARC( { 474000, 622000 }, { 534000, 520000 }, { 518000, 470000 }, 0 ) );
+        o0h1.SetClosed( true );
+        holeyCurvedPolySingle.AddHole( o0h1 );
+
+        SHAPE_LINE_CHAIN o0h2;
+        o0h2.Append( SHAPE_ARC( { 680000, 286000 }, { 728000, 306000 }, { 760000, 258000 }, 0 ) );
+        o0h2.Append( SHAPE_ARC( { 760000, 258000 }, { 746000, 222000 }, { 686000, 260000 }, 0 ) );
+        o0h2.SetClosed( true );
+        holeyCurvedPolySingle.AddHole( o0h2 );
+
+        holeyCurvedPolyMulti = holeyCurvedPolySingle;
+
+        // Second shape:
+        SHAPE_LINE_CHAIN oline1;
+        oline1.Append( { 640000, 840000 } );
+        oline1.Append( SHAPE_ARC( { 829000, 959000 }, { 990000, 736000 }, { 951000, 461000 }, 0 ) );
+        oline1.Append( SHAPE_ARC( { 951000, 461000 }, { 600000, 572000 }, { 620000, 726000 }, 0 ) );
+        oline1.SetClosed( true );
+        holeyCurvedPolyMulti.AddOutline( oline1 );
+
+        SHAPE_LINE_CHAIN o1h1;
+        o1h1.Append( { 670000, 482000 } );
+        o1h1.Append( SHAPE_ARC( { 642000, 576000 }, { 736000, 652000 }, { 774000, 622000 }, 0 ) );
+        o1h1.Append( SHAPE_ARC( { 774000, 622000 }, { 834000, 520000 }, { 818000, 470000 }, 0 ) );
+        o1h1.SetClosed( true );
+        holeyCurvedPolyMulti.AddHole( o1h1 );
+
+        SHAPE_LINE_CHAIN o1h2;
+        o1h2.Append( SHAPE_ARC( { 680000, 286000 }, { 728000, 306000 }, { 760000, 258000 }, 0 ) );
+        o1h2.Append( SHAPE_ARC( { 760000, 258000 }, { 746000, 222000 }, { 686000, 260000 }, 0 ) );
+        o1h2.SetClosed( true );
+        holeyCurvedPolyMulti.AddHole( o1h2 );
     }
 
     ~CommonTestData()

qa/libs/kimath/geometry/test_shape_poly_set_arcs.cpp

@@ -0,0 +1,54 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2021 Roberto Fernandez Bautista <roberto.fer.bau@gmail.com>
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <tuple>
+#include <unit_test_utils/unit_test_utils.h>
+
+#include <geometry/shape_line_chain.h>
+#include <geometry/shape_poly_set.h>
+
+#include "fixtures_geometry.h"
+
+
+BOOST_AUTO_TEST_SUITE( CurvedPolys )
+
+/**
+ * Simplify the polygon a large number of times and check that the area
+ * does not change.
+ */
+BOOST_AUTO_TEST_CASE( TestSimplify )
+{
+    KI_TEST::CommonTestData testData;
+    SHAPE_POLY_SET testPoly = testData.holeyCurvedPolySingle;
+
+    double originalArea = testData.holeyCurvedPolySingle.Area();
+
+    for( int i = 1; i < 20; i++ )
+    {
+        BOOST_TEST_CONTEXT( "Simplify Iteration " << i )
+        {
+            testPoly.Simplify( SHAPE_POLY_SET::POLYGON_MODE::PM_FAST );
+
+            BOOST_CHECK_EQUAL( testPoly.Area(), originalArea );
+    }
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()