haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/qa/libs/kimath/geometry/test_shape_arc.cpp

934 lines
31 KiB
C++
Raw Normal View History

QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
We don't keep a CHANGELOG.TXT Direct interested readers to AUTHORS.TXT instead.
2021-10-06 02:46:53 +00:00
* Copyright (C) 2018-2020 KiCad Developers, see AUTHORS.TXT for contributors.
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
*
* 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 2
* 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, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
Added a few more test cases
2021-07-11 21:35:53 +00:00
#include <convert_basic_shapes_to_polygon.h>
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
#include <geometry/shape_arc.h>
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
#include <geometry/shape_line_chain.h>
qa: merge unit_test_utils to qa_utils
2021-02-06 22:20:31 +00:00
#include <qa_utils/geometry/geometry.h>
#include <qa_utils/numeric.h>
#include <qa_utils/wx_utils/unit_test_utils.h>
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
#include "geom_test_utils.h"
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
BOOST_AUTO_TEST_SUITE( ShapeArc )
/**
* All properties of an arc (depending on how it's constructed, some of these
* might be the same as the constructor params)
*/
struct ARC_PROPERTIES
{
VECTOR2I m_center_point;
VECTOR2I m_start_point;
VECTOR2I m_end_point;
double m_center_angle;
double m_start_angle;
double m_end_angle;
int m_radius;
BOX2I m_bbox;
};
/**
* Check a #SHAPE_ARC against a given set of geometric properties
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
* @param aArc Arc to test
* @param aProps Properties to test against
* @param aSynErrIU Permitted error for synthetic points and dimensions (currently radius and center)
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
*/
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
static void CheckArcGeom( const SHAPE_ARC& aArc, const ARC_PROPERTIES& aProps, const int aSynErrIU = 1 )
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
{
Move SHAPE_ARC to start->mid->end format The arc shapes need to connect with their adjacent points. By storing the relevant points, we allow exact point matching on both ends of the arc as well as localize point storage.
2020-06-12 21:58:24 +00:00
// Angular error - note this can get quite large for very small arcs,
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
// as the integral position rounding has a relatively greater effect
Move SHAPE_ARC to start->mid->end format The arc shapes need to connect with their adjacent points. By storing the relevant points, we allow exact point matching on both ends of the arc as well as localize point storage.
2020-06-12 21:58:24 +00:00
const double angle_tol_deg = 1.0;
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
// Position error - rounding to nearest integer
const int pos_tol = 1;
BOOST_CHECK_PREDICATE( KI_TEST::IsVecWithinTol<VECTOR2I>,
( aProps.m_start_point )( aProps.m_start_point )( pos_tol ) );
BOOST_CHECK_PREDICATE(
KI_TEST::IsVecWithinTol<VECTOR2I>, ( aArc.GetP1() )( aProps.m_end_point )( pos_tol ) );
BOOST_CHECK_PREDICATE( KI_TEST::IsVecWithinTol<VECTOR2I>,
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
( aArc.GetCenter() )( aProps.m_center_point )( aSynErrIU ) );
Move SHAPE_ARC to start->mid->end format The arc shapes need to connect with their adjacent points. By storing the relevant points, we allow exact point matching on both ends of the arc as well as localize point storage.
2020-06-12 21:58:24 +00:00
BOOST_CHECK_PREDICATE( KI_TEST::IsWithinWrapped<double>,
( aArc.GetCentralAngle() )( aProps.m_center_angle )( 360.0 )( angle_tol_deg ) );
BOOST_CHECK_PREDICATE( KI_TEST::IsWithinWrapped<double>,
( aArc.GetStartAngle() )( aProps.m_start_angle )( 360.0 )( angle_tol_deg ) );
BOOST_CHECK_PREDICATE( KI_TEST::IsWithinWrapped<double>,
( aArc.GetEndAngle() )( aProps.m_end_angle )( 360.0 )( angle_tol_deg ) );
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
BOOST_CHECK_PREDICATE(
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
KI_TEST::IsWithin<double>, ( aArc.GetRadius() )( aProps.m_radius )( aSynErrIU ) );
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
/// Check the chord agrees
const auto chord = aArc.GetChord();
BOOST_CHECK_PREDICATE(
KI_TEST::IsVecWithinTol<VECTOR2I>, ( chord.A )( aProps.m_start_point )( pos_tol ) );
BOOST_CHECK_PREDICATE(
KI_TEST::IsVecWithinTol<VECTOR2I>, ( chord.B )( aProps.m_end_point )( pos_tol ) );
/// All arcs are solid
BOOST_CHECK_EQUAL( aArc.IsSolid(), true );
BOOST_CHECK_PREDICATE(
KI_TEST::IsBoxWithinTol<BOX2I>, ( aArc.BBox() )( aProps.m_bbox )( pos_tol ) );
/// Collisions will be checked elsewhere.
}
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
/**
* Check an arcs geometry and other class functions
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
* @param aArc Arc to test
* @param aProps Properties to test against
* @param aSynErrIU Permitted error for synthetic points and dimensions (currently radius and center)
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
*/
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
static void CheckArc( const SHAPE_ARC& aArc, const ARC_PROPERTIES& aProps, const int aSynErrIU = 1 )
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
{
// Check the original arc
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
CheckArcGeom( aArc, aProps, aSynErrIU );
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
// Test the Clone function (also tests copy-ctor)
std::unique_ptr<SHAPE> new_shape{ aArc.Clone() };
BOOST_CHECK_EQUAL( new_shape->Type(), SH_ARC );
SHAPE_ARC* new_arc = dynamic_cast<SHAPE_ARC*>( new_shape.get() );
BOOST_REQUIRE( new_arc != nullptr );
/// Should have identical geom props
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
CheckArcGeom( *new_arc, aProps, aSynErrIU );
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
}
/**
* Check correct handling of filter strings (as used by WX)
*/
BOOST_AUTO_TEST_CASE( NullCtor )
{
auto arc = SHAPE_ARC();
BOOST_CHECK_EQUAL( arc.GetWidth(), 0 );
static ARC_PROPERTIES null_props{
{ 0, 0 },
{ 0, 0 },
{ 0, 0 },
0,
0,
0,
0,
};
CheckArc( arc, null_props );
}
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
/**
* Info to set up an arc by centre, start point and angle
*
* In future there may be more ways to set this up, so keep it separate
*/
struct ARC_CENTRE_PT_ANGLE
{
VECTOR2I m_center_point;
VECTOR2I m_start_point;
double m_center_angle;
};
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
struct ARC_CPA_CASE
{
/// The text context name
std::string m_ctx_name;
/// Geom of the arc
ARC_CENTRE_PT_ANGLE m_geom;
/// Arc line width
int m_width;
/// Expected properties
ARC_PROPERTIES m_properties;
};
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
static const std::vector<ARC_CPA_CASE> arc_cases = {
Adding failed arc test This test implements a case where the current arc calculations fail
2020-07-18 19:22:45 +00:00
{
"C(0,0) 114 + 360 degree",
{
{ 0, 0 },
{ -306451, 687368 },
360,
},
0,
{
{ 0, 0 },
{ -306451, 687368 },
{ -306451, 687368 },
360,
113.95929,
113.95929,
752587,
{ { -752587, -752587 }, { 1505174, 1505174 } },
},
},
{
"C(0,0) 180 + 360 degree",
{
{ 0, 0 },
{ -100, 0 },
360,
},
0,
{
{ 0, 0 },
{ -100, 0 },
{ -100, 0 },
360,
180,
180,
100,
{ { -100, -100 }, { 200, 200 } },
},
},
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
{
"C(0,0) 180 + 90 degree",
{
{ 0, 0 },
{ -100, 0 },
90,
},
0,
{
{ 0, 0 },
{ -100, 0 },
{ 0, -100 },
90,
180,
270,
100,
{ { -100, -100 }, { 100, 100 } },
},
},
{
"C(100,200) 0 - 30 degree",
{
{ 100, 200 },
{ 300, 200 },
-30,
},
0,
{
{ 100, 200 },
{ 300, 200 },
{ 273, 100 }, // 200 * sin(30) = 100, 200* cos(30) = 173
-30,
0,
330,
200,
Fix QA arc test according to the new arc bounding box calculation. Previously, the arc center was included in the bounding box, but this is incorrect. In many cases it is not in the bbox, and can be very far away.
2020-01-04 09:16:09 +00:00
{ { 273, 100 }, { 27, 100 } },
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
},
},
{
// This is a "fan shape" which includes the top quadrant point,
// so it exercises the bounding box code (centre and end points
// do not contain the top quadrant)
"C(0,0) 30 + 120 degree",
{
{ 0, 0 },
{ 17320, 10000 },
120,
},
0,
{
{ 0, 0 },
{ 17320, 10000 },
{ -17320, 10000 }, // 200 * sin(30) = 100, 200* cos(30) = 173
120,
30,
150,
20000,
// bbox defined by: centre, top quadrant point, two endpoints
Fix QA arc test according to the new arc bounding box calculation. Previously, the arc center was included in the bounding box, but this is incorrect. In many cases it is not in the bbox, and can be very far away.
2020-01-04 09:16:09 +00:00
{ { -17320, 10000 }, { 17320 * 2, 10000 } },
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
},
},
{
// An arc that covers three quadrant points (L/R, bottom)
"C(0,0) 150 + 240 degree",
{
{ 0, 0 },
{ -17320, 10000 },
240,
},
0,
{
{ 0, 0 },
{ -17320, 10000 },
{ 17320, 10000 },
240,
150,
30,
20000,
// bbox defined by: L/R quads, bottom quad and start/end
{ { -20000, -20000 }, { 40000, 30000 } },
},
},
{
// Same as above but reverse direction
"C(0,0) 30 - 300 degree",
{
{ 0, 0 },
{ 17320, 10000 },
-240,
},
0,
{
{ 0, 0 },
{ 17320, 10000 },
{ -17320, 10000 },
-240,
30,
150,
20000,
// bbox defined by: L/R quads, bottom quad and start/end
{ { -20000, -20000 }, { 40000, 30000 } },
},
},
};
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
Geom: Account for quadrant points in arc bbox calc This means arcs that pass though quadrant points (multiple of 0, 90, 180, 270 degrees) include these points in the bbox.
2019-01-09 12:01:00 +00:00
BOOST_AUTO_TEST_CASE( BasicCPAGeom )
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
{
for( const auto& c : arc_cases )
{
BOOST_TEST_CONTEXT( c.m_ctx_name )
{
const auto this_arc = SHAPE_ARC{ c.m_geom.m_center_point, c.m_geom.m_start_point,
c.m_geom.m_center_angle, c.m_width };
CheckArc( this_arc, c.m_properties );
}
}
}
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
/**
* Info to set up an arc by tangent to two segments and a radius
*/
struct ARC_TAN_TAN_RADIUS
{
SEG m_segment_1;
SEG m_segment_2;
int m_radius;
};
struct ARC_TTR_CASE
{
/// The text context name
std::string m_ctx_name;
/// Geom of the arc
ARC_TAN_TAN_RADIUS m_geom;
/// Arc line width
int m_width;
/// Expected properties
ARC_PROPERTIES m_properties;
};
static const std::vector<ARC_TTR_CASE> arc_ttr_cases = {
{
"90 degree segments intersecting",
{
{ 0, 0, 0, 1000 },
{ 0, 0, 1000, 0 },
1000,
},
0,
{
{ 1000, 1000 },
{ 0, 1000 }, //start on first segment
{ 1000, 0 }, //end on second segment
90, //positive angle due to start/end
180,
270,
1000,
{ { 0, 0 }, { 1000, 1000 } },
}
},
{
"45 degree segments intersecting",
{
{ 0, 0, 0, 1000 },
{ 0, 0, 1000, 1000 },
1000,
},
0,
{
{ 1000, 2414 },
{ 0, 2414 }, //start on first segment
{ 1707, 1707 }, //end on second segment
135, //positive angle due to start/end
180,
225,
1000,
{ { 0, 1414 }, { 1707, 1000 } },
}
},
{
"135 degree segments intersecting",
{
{ 0, 0, 0, 1000 },
{ 0, 0, 1000, -1000 },
1000,
},
0,
{
{ 1000, 414 },
{ 0, 414 }, //start on first segment ( radius * tan(45 /2) )
{ 293, -293 }, //end on second segment (radius * 1-cos(45)) )
45, //positive angle due to start/end
180,
225,
1000,
{ { 0, -293 }, { 293, 707 } },
}
}
};
BOOST_AUTO_TEST_CASE( BasicTTRGeom )
{
for( const auto& c : arc_ttr_cases )
{
BOOST_TEST_CONTEXT( c.m_ctx_name )
{
for( int testCase = 0; testCase < 8; ++testCase )
{
SEG seg1 = c.m_geom.m_segment_1;
SEG seg2 = c.m_geom.m_segment_2;
ARC_PROPERTIES props = c.m_properties;
if( testCase > 3 )
{
//Swap input segments.
seg1 = c.m_geom.m_segment_2;
Fix SHAPE_ARC::Collide and add Unit Tests
2021-03-14 20:26:35 +00:00
seg2 = c.m_geom.m_segment_1;
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
//The result should swap start and end points and invert the angles:
props.m_end_point = c.m_properties.m_start_point;
props.m_start_point = c.m_properties.m_end_point;
props.m_start_angle = c.m_properties.m_end_angle;
props.m_end_angle = c.m_properties.m_start_angle;
props.m_center_angle = -c.m_properties.m_center_angle;
}
Fix SHAPE_ARC::Collide and add Unit Tests
2021-03-14 20:26:35 +00:00
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
//Test all combinations of start and end points for the segments
if( ( testCase % 4 ) == 1 || ( testCase % 4 ) == 3 )
{
//Swap start and end points for seg1
VECTOR2I temp = seg1.A;
seg1.A = seg1.B;
seg1.B = temp;
}
Fix SHAPE_ARC::Collide and add Unit Tests
2021-03-14 20:26:35 +00:00
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
if( ( testCase % 4 ) == 2 || ( testCase % 4 ) == 3 )
{
//Swap start and end points for seg2
VECTOR2I temp = seg2.A;
seg2.A = seg2.B;
seg2.B = temp;
}
const auto this_arc = SHAPE_ARC{ seg1, seg2,
c.m_geom.m_radius, c.m_width };
// Error of 4 IU permitted for the center and radius calculation
CheckArc( this_arc, props, SHAPE_ARC::MIN_PRECISION_IU );
}
}
}
}
SHAPE_LINE_CHAIN splitArc on Insert, Remove and Replace This ensures that the arc shapes remain correct after removing a point belonging to an arc or inserting a point in the middle of an arc. Simplify implementation of Replace( ..., aP ). Now a Remove operation followed by an Insert operation. Improve QA test for SHAPE_LINE_CHAIN Append, Insert and Replace Implement SHAPE_LINE_CHAIN::splitArc to break up an arc into two Implement SHAPE_ARC::ConstructFromStartEndCenter and add qa test
2021-05-09 22:27:02 +00:00
/**
* Info to set up an arc start, end and center
*/
struct ARC_START_END_CENTER
{
VECTOR2I m_start;
VECTOR2I m_end;
VECTOR2I m_center;
};
struct ARC_SEC_CASE
{
/// The text context name
std::string m_ctx_name;
/// Geom of the arc
ARC_START_END_CENTER m_geom;
/// clockwise or anti-clockwise?
bool m_clockwise;
/// Expected mid-point of the arc
VECTOR2I m_expected_mid;
};
static const std::vector<ARC_SEC_CASE> arc_sec_cases = {
{ "180 deg, clockwise", { { 100, 0 }, { 0, 0 }, { 50, 0 } }, true, { 50, -50 } },
{ "180 deg, anticlockwise", { { 100, 0 }, { 0, 0 }, { 50, 0 } }, false, { 50, 50 } },
{ "180 deg flipped, clockwise", { { 0, 0 }, { 100, 0 }, { 50, 0 } }, true, { 50, 50 } },
{ "180 deg flipped, anticlockwise", { { 0, 0 }, { 100, 0 }, { 50, 0 } }, false, { 50, -50 } },
{ "90 deg, clockwise", { { -100, 0 }, { 0, 100 }, { 0, 0 } }, true, { -71, 71 } },
{ "90 deg, anticlockwise", { { -100, 0 }, { 0, 100 }, { 0, 0 } }, false, { 71, -71 } },
};
BOOST_AUTO_TEST_CASE( BasicSECGeom )
{
for( const auto& c : arc_sec_cases )
{
BOOST_TEST_CONTEXT( c.m_ctx_name )
{
VECTOR2I start = c.m_geom.m_start;
VECTOR2I end = c.m_geom.m_end;
VECTOR2I center = c.m_geom.m_center;
bool cw = c.m_clockwise;
SHAPE_ARC this_arc;
this_arc.ConstructFromStartEndCenter( start, end, center, cw );
BOOST_CHECK_EQUAL( this_arc.GetArcMid(), c.m_expected_mid );
}
}
}
Fix SHAPE_ARC::Collide and add Unit Tests
2021-03-14 20:26:35 +00:00
struct ARC_PT_COLLIDE_CASE
{
std::string m_ctx_name;
ARC_CENTRE_PT_ANGLE m_geom;
int m_arc_clearance;
VECTOR2I m_point;
bool m_exp_result;
int m_exp_distance;
};
static const std::vector<ARC_PT_COLLIDE_CASE> arc_pt_collide_cases = {
{ " 270deg, 0 cl, 0 deg ", { { 0, 0 }, { 100, 0 }, 270.0 }, 0, { 100, 0 }, true, 0 },
{ " 270deg, 0 cl, 90 deg ", { { 0, 0 }, { 100, 0 }, 270.0 }, 0, { 0, 100 }, true, 0 },
{ " 270deg, 0 cl, 180 deg ", { { 0, 0 }, { 100, 0 }, 270.0 }, 0, { -100, 0 }, true, 0 },
{ " 270deg, 0 cl, 270 deg ", { { 0, 0 }, { 100, 0 }, 270.0 }, 0, { 0, -100 }, true, 0 },
{ " 270deg, 0 cl, 45 deg ", { { 0, 0 }, { 100, 0 }, 270.0 }, 0, { 71, 71 }, true, 0 },
{ " 270deg, 0 cl, -45 deg ", { { 0, 0 }, { 100, 0 }, 270.0 }, 0, { 71, -71 }, false, -1 },
{ "-270deg, 0 cl, 0 deg ", { { 0, 0 }, { 100, 0 }, -270.0 }, 0, { 100, 0 }, true, 0 },
{ "-270deg, 0 cl, 90 deg ", { { 0, 0 }, { 100, 0 }, -270.0 }, 0, { 0, 100 }, true, 0 },
{ "-270deg, 0 cl, 180 deg ", { { 0, 0 }, { 100, 0 }, -270.0 }, 0, { -100, 0 }, true, 0 },
{ "-270deg, 0 cl, 270 deg ", { { 0, 0 }, { 100, 0 }, -270.0 }, 0, { 0, -100 }, true, 0 },
{ "-270deg, 0 cl, 45 deg ", { { 0, 0 }, { 100, 0 }, -270.0 }, 0, { 71, 71 }, false, -1 },
{ "-270deg, 0 cl, -45 deg ", { { 0, 0 }, { 100, 0 }, -270.0 }, 0, { 71, -71 }, true, 0 },
{ " 270deg, 5 cl, 0 deg, 5 pos X", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 105, 0 }, true, 5 },
{ " 270deg, 5 cl, 0 deg, 5 pos Y", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 100, -5 }, true, 5 },
{ " 270deg, 5 cl, 90 deg, 5 pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 0, 105 }, true, 5 },
{ " 270deg, 5 cl, 180 deg, 5 pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { -105, 0 }, true, 5 },
{ " 270deg, 5 cl, 270 deg, 5 pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 0, -105 }, true, 5 },
{ " 270deg, 5 cl, 0 deg, 5 neg", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 105, 0 }, true, 5 },
{ " 270deg, 5 cl, 90 deg, 5 neg", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 0, 105 }, true, 5 },
{ " 270deg, 5 cl, 180 deg, 5 neg", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { -105, 0 }, true, 5 },
{ " 270deg, 5 cl, 270 deg, 5 neg", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 0, -105 }, true, 5 },
{ " 270deg, 5 cl, 45 deg, 5 pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 75, 74 }, true, 5 },
{ " 270deg, 5 cl, -45 deg, 5 pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 75, -74 }, false, -1 },
{ " 270deg, 5 cl, 45 deg, 5 neg", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 67, 68 }, true, 5 },
{ " 270deg, 5 cl, -45 deg, 5 neg", { { 0, 0 }, { 100, 0 }, 270.0 }, 5, { 67, -68 }, false, -1 },
{ " 270deg, 4 cl, 0 deg pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 4, { 105, 0 }, false, -1 },
{ " 270deg, 4 cl, 90 deg pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 4, { 0, 105 }, false, -1 },
{ " 270deg, 4 cl, 180 deg pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 4, { -105, 0 }, false, -1 },
{ " 270deg, 4 cl, 270 deg pos", { { 0, 0 }, { 100, 0 }, 270.0 }, 4, { 0, -105 }, false, -1 },
{ " 90deg, 0 cl, 0 deg ", { { 0, 0 }, { 71, -71 }, 90.0 }, 0, { 71, -71 }, true, 0 },
{ " 90deg, 0 cl, 45 deg ", { { 0, 0 }, { 71, -71 }, 90.0 }, 0, { 100, 0 }, true, 0 },
{ " 90deg, 0 cl, 90 deg ", { { 0, 0 }, { 71, -71 }, 90.0 }, 0, { 71, 71 }, true, 0 },
{ " 90deg, 0 cl, 135 deg ", { { 0, 0 }, { 71, -71 }, 90.0 }, 0, { 0, -100 }, false, -1 },
{ " 90deg, 0 cl, -45 deg ", { { 0, 0 }, { 71, -71 }, 90.0 }, 0, { 0, 100 }, false, -1 },
{ " -90deg, 0 cl, 0 deg ", { { 0, 0 }, { 71, 71 }, -90.0 }, 0, { 71, -71 }, true, 0 },
{ " -90deg, 0 cl, 45 deg ", { { 0, 0 }, { 71, 71 }, -90.0 }, 0, { 100, 0 }, true, 0 },
{ " -90deg, 0 cl, 90 deg ", { { 0, 0 }, { 71, 71 }, -90.0 }, 0, { 71, 71 }, true, 0 },
{ " -90deg, 0 cl, 135 deg ", { { 0, 0 }, { 71, 71 }, -90.0 }, 0, { 0, -100 }, false, -1 },
{ " -90deg, 0 cl, -45 deg ", { { 0, 0 }, { 71, 71 }, -90.0 }, 0, { 0, 100 }, false, -1 },
};
BOOST_AUTO_TEST_CASE( CollidePt )
{
for( const auto& c : arc_pt_collide_cases )
{
BOOST_TEST_CONTEXT( c.m_ctx_name )
{
SHAPE_ARC arc( c.m_geom.m_center_point, c.m_geom.m_start_point,
c.m_geom.m_center_angle );
// Test a zero width arc (distance should equal the clearance)
BOOST_TEST_CONTEXT( "Test Clearance" )
{
int dist = -1;
BOOST_CHECK_EQUAL( arc.Collide( c.m_point, c.m_arc_clearance, &dist ),
c.m_exp_result );
BOOST_CHECK_EQUAL( dist, c.m_exp_distance );
}
// Test by changing the width of the arc (distance should equal zero)
BOOST_TEST_CONTEXT( "Test Width" )
{
int dist = -1;
arc.SetWidth( c.m_arc_clearance * 2 );
BOOST_CHECK_EQUAL( arc.Collide( c.m_point, 0, &dist ), c.m_exp_result );
if( c.m_exp_result )
BOOST_CHECK_EQUAL( dist, 0 );
else
BOOST_CHECK_EQUAL( dist, -1 );
}
}
}
}
ADDED: Fillet Tracks tool in pcbnew Select two or more track segments and run the "Fillet Tracks" tool.
2020-10-20 21:23:05 +00:00
Added a few more test cases
2021-07-11 21:35:53 +00:00
struct ARC_DATA_MM
{
// Coordinates and dimensions in millimeters
double m_center_x;
double m_center_y;
double m_start_x;
double m_start_y;
double m_center_angle;
double m_width;
SHAPE_ARC GenerateArc() const
{
Simplify & move new arc collision code into Kimath library Don't need to check intersections with the circle, just fix the calculated "projected" point from the end points. Fixes https://gitlab.com/kicad/code/kicad/-/issues/8234
2021-07-25 19:46:00 +00:00
SHAPE_ARC arc( VECTOR2D( PcbMm2iu( m_center_x ), PcbMm2iu( m_center_y ) ),
VECTOR2D( PcbMm2iu( m_start_x ), PcbMm2iu( m_start_y ) ),
m_center_angle, PcbMm2iu( m_width ) );
Added a few more test cases
2021-07-11 21:35:53 +00:00
return arc;
}
};
struct ARC_ARC_COLLIDE_CASE
{
std::string m_ctx_name;
ARC_DATA_MM m_arc1;
ARC_DATA_MM m_arc2;
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
double m_clearance;
Added a few more test cases
2021-07-11 21:35:53 +00:00
bool m_exp_result;
};
static const std::vector<ARC_ARC_COLLIDE_CASE> arc_arc_collide_cases = {
{ "case 1: No intersection",
{ 73.843527, 74.355869, 71.713528, 72.965869, -76.36664803, 0.2 },
{ 71.236473, 74.704131, 73.366472, 76.094131, -76.36664803, 0.2 },
0,
false },
{ "case 2: No intersection",
{ 82.542335, 74.825975, 80.413528, 73.435869, -76.4, 0.2 },
{ 76.491192, 73.839894, 78.619999, 75.23, -76.4, 0.2 },
0,
false },
{ "case 3: No intersection",
{ 89.318807, 74.810106, 87.19, 73.42, -76.4, 0.2 },
{ 87.045667, 74.632941, 88.826472, 75.794131, -267.9, 0.2 },
0,
false },
{ "case 4: Co-centered not intersecting",
{ 94.665667, 73.772941, 96.446472, 74.934131, -267.9, 0.2 },
{ 94.665667, 73.772941, 93.6551, 73.025482, -255.5, 0.2 },
0,
false },
{ "case 5: Not intersecting, but end points very close",
{ 72.915251, 80.493054, 73.570159, 81.257692, -260.5, 0.2 },
{ 73.063537, 82.295989, 71.968628, 81.581351, -255.5, 0.2 },
0,
false },
{ "case 6: Coincident centers, colliding due to arc thickness",
{ 79.279991, 80.67988, 80.3749, 81.394518, -255.5, 0.2 },
{ 79.279991, 80.67988, 80.3749, 81.694518, -255.5, 0.2 },
0,
true },
{ "case 7: Single intersection",
{ 88.495265, 81.766089, 90.090174, 82.867869, -255.5, 0.2 },
{ 86.995265, 81.387966, 89.090174, 82.876887, -255.5, 0.2 },
0,
true },
{ "case 8: Double intersection",
{ 96.149734, 81.792126, 94.99, 83.37, -347.2, 0.2 },
{ 94.857156, 81.240589, 95.91, 83.9, -288.5, 0.2 },
0,
true },
{ "case 9: Endpoints within arc width",
{ 72.915251, 86.493054, 73.970159, 87.257692, -260.5, 0.2 },
{ 73.063537, 88.295989, 71.968628, 87.581351, -255.5, 0.2 },
0,
true },
{ "case 10: Endpoints close, outside, no collision",
{ 78.915251, 86.393054, 79.970159, 87.157692, 99.5, 0.2 },
{ 79.063537, 88.295989, 77.968628, 87.581351, -255.5, 0.2 },
0,
false },
{ "case 11: Endpoints close, inside, collision due to arc width",
{ 85.915251, 86.993054, 86.970159, 87.757692, 99.5, 0.2 },
{ 86.063537, 88.295989, 84.968628, 87.581351, -255.5, 0.2 },
0,
true },
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
{ "case 12: Simulated differential pair meander",
{ 94.6551, 88.295989, 95.6551, 88.295989, 90.0, 0.1 },
{ 94.6551, 88.295989, 95.8551, 88.295989, 90.0, 0.1 },
Simplify & move new arc collision code into Kimath library Don't need to check intersections with the circle, just fix the calculated "projected" point from the end points. Fixes https://gitlab.com/kicad/code/kicad/-/issues/8234
2021-07-25 19:46:00 +00:00
// Offset needed due to rounding errors of integer coordinates
0.1 - PcbIu2mm( SHAPE_ARC::MIN_PRECISION_IU ),
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
false },
Simplify & move new arc collision code into Kimath library Don't need to check intersections with the circle, just fix the calculated "projected" point from the end points. Fixes https://gitlab.com/kicad/code/kicad/-/issues/8234
2021-07-25 19:46:00 +00:00
{ "case 13: One arc fully enclosed in other, non-concentric",
{ 73.77532, 93.413654, 75.70532, 93.883054, 60.0, 0.1 },
{ 73.86532, 93.393054, 75.86532, 93.393054, 90.0, 0.3 },
0,
true },
{ "case 14: One arc fully enclosed in other, concentric",
{ 79.87532, 93.413654, 81.64532, 94.113054, 60.0, 0.1 },
{ 79.87532, 93.413654, 81.86532, 93.393054, 90.0, 0.3 },
0,
true },
Added a few more test cases
2021-07-11 21:35:53 +00:00
};
BOOST_AUTO_TEST_CASE( CollideArc )
{
for( const auto& c : arc_arc_collide_cases )
{
BOOST_TEST_CONTEXT( c.m_ctx_name )
{
SHAPE_ARC arc1( c.m_arc1.GenerateArc() );
SHAPE_ARC arc2( c.m_arc2.GenerateArc() );
int actual = 0;
VECTOR2I location;
Simplify & move new arc collision code into Kimath library Don't need to check intersections with the circle, just fix the calculated "projected" point from the end points. Fixes https://gitlab.com/kicad/code/kicad/-/issues/8234
2021-07-25 19:46:00 +00:00
bool result = arc1.Collide( &arc2, PcbMm2iu( c.m_clearance ), &actual, &location );
Added a few more test cases
2021-07-11 21:35:53 +00:00
BOOST_CHECK_EQUAL( result, c.m_exp_result );
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
}
}
}
Added a few more test cases
2021-07-11 21:35:53 +00:00
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
BOOST_AUTO_TEST_CASE( CollideArcToPolygonApproximation )
{
SHAPE_ARC arc( VECTOR2I( 73843527, 74355869 ), VECTOR2I( 71713528, 72965869 ), -76.36664803,
2000000 );
Added a few more test cases
2021-07-11 21:35:53 +00:00
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
// Create a polyset approximation from the arc - error outside (simulating the zone filler)
SHAPE_POLY_SET arcBuffer;
int clearance = ( arc.GetWidth() * 3 ) / 2;
Add true arc-to-polyline collisions
2021-07-26 16:14:05 +00:00
int polygonApproximationError = SHAPE_ARC::DefaultAccuracyForPCB();
Added a few more test cases
2021-07-11 21:35:53 +00:00
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
TransformArcToPolygon( arcBuffer, wxPoint( arc.GetP0() ), wxPoint( arc.GetArcMid() ),
wxPoint( arc.GetP1() ), arc.GetWidth() + 2 * clearance,
Add true arc-to-polyline collisions
2021-07-26 16:14:05 +00:00
polygonApproximationError, ERROR_OUTSIDE );
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
BOOST_REQUIRE_EQUAL( arcBuffer.OutlineCount(), 1 );
BOOST_CHECK_EQUAL( arcBuffer.HoleCount( 0 ), 0 );
// Make a reasonably large rectangular outline around the arc shape
BOX2I arcbbox = arc.BBox( clearance * 4 );
SHAPE_LINE_CHAIN zoneOutline( { arcbbox.GetPosition(),
arcbbox.GetPosition() + VECTOR2I( arcbbox.GetWidth(), 0 ),
arcbbox.GetEnd(),
arcbbox.GetEnd() - VECTOR2I( arcbbox.GetWidth(), 0 )
},
true );
// Create a synthetic "zone fill" polygon
SHAPE_POLY_SET zoneFill;
zoneFill.AddOutline( zoneOutline );
zoneFill.AddHole( arcBuffer.Outline( 0 ) );
int actual = 0;
VECTOR2I location;
Simplify & move new arc collision code into Kimath library Don't need to check intersections with the circle, just fix the calculated "projected" point from the end points. Fixes https://gitlab.com/kicad/code/kicad/-/issues/8234
2021-07-25 19:46:00 +00:00
int tol = SHAPE_ARC::MIN_PRECISION_IU;
Add more test cases: simulate zone fill around arc + diff pair meander
2021-07-13 19:01:53 +00:00
BOOST_CHECK_EQUAL( zoneFill.Collide( &arc, clearance - tol, &actual, &location ), false );
BOOST_CHECK_EQUAL( zoneFill.Collide( &arc, clearance * 2, &actual, &location ), true );
Add true arc-to-polyline collisions
2021-07-26 16:14:05 +00:00
BOOST_CHECK( KI_TEST::IsWithin( actual, clearance, polygonApproximationError ) );
Added a few more test cases
2021-07-11 21:35:53 +00:00
}
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
struct ARC_TO_POLYLINE_CASE
{
std::string m_ctx_name;
ARC_CENTRE_PT_ANGLE m_geom;
};
/**
* Predicate for checking a polyline has all the points on (near) a circle of
* given centre and radius
* @param aPolyline the polyline to check
* @param aCentre the circle centre
* @param aRad the circle radius
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
* @param aTolerance the tolerance for the endpoint-centre distance
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
* @return true if predicate met
*/
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
bool ArePolylineEndPointsNearCircle( const SHAPE_LINE_CHAIN& aPolyline, const VECTOR2I& aCentre,
int aRad, int aTolerance )
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
{
std::vector<VECTOR2I> points;
for( int i = 0; i < aPolyline.PointCount(); ++i )
{
points.push_back( aPolyline.CPoint( i ) );
}
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
return GEOM_TEST::ArePointsNearCircle( points, aCentre, aRad, aTolerance );
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
}
Remove all debugging output that cannot be disabled. The use of printf, wxLogDebug, and std::err/std::out causes excessive debugging output which makes finding specific debugging messages more difficult than it needs to be. There is still some debugging output in test code that really needs to be moved into a unit test. Add debugging output section to the coding policy regarding debugging output.
2020-08-18 14:17:16 +00:00
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
/**
* Predicate for checking a polyline has all the segment mid points on
* (near) a circle of given centre and radius
* @param aPolyline the polyline to check
* @param aCentre the circle centre
* @param aRad the circle radius
* @param aTolEnds the tolerance for the midpoint-centre distance
* @return true if predicate met
*/
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
bool ArePolylineMidPointsNearCircle( const SHAPE_LINE_CHAIN& aPolyline, const VECTOR2I& aCentre,
int aRad, int aTolerance )
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
{
std::vector<VECTOR2I> points;
for( int i = 0; i < aPolyline.PointCount() - 1; ++i )
{
const VECTOR2I mid_pt = ( aPolyline.CPoint( i ) + aPolyline.CPoint( i + 1 ) ) / 2;
points.push_back( mid_pt );
}
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
return GEOM_TEST::ArePointsNearCircle( points, aCentre, aRad, aTolerance );
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
}
SHAPE_ARC: Fix bug introduced in 5813164d1. This fixes the bug exposed in the previous commit. The tests which exposed it now pass and expected failures removed.
2019-04-25 22:12:17 +00:00
BOOST_AUTO_TEST_CASE( ArcToPolyline )
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
{
const std::vector<ARC_TO_POLYLINE_CASE> cases = {
{
"Zero rad",
{
{ 0, 0 },
{ 0, 0 },
180,
},
},
{
"Semicircle",
{
{ 0, 0 },
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
{ -1000000, 0 },
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
180,
},
},
{
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
// check that very small circles don't fall apart and that reverse angles
// work too
"Extremely small semicircle",
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
{
{ 0, 0 },
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
{ -1000, 0 },
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
-180,
},
},
{
// Make sure it doesn't only work for "easy" angles
"Non-round geometry",
{
{ 0, 0 },
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
{ 1234567, 0 },
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
42.22,
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
},
},
};
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
const int width = 0;
// Note: do not expect accuracies around 1 to work. We use integers internally so we're
// liable to rounding errors. In PCBNew accuracy defaults to 5000 and we don't recommend
// anything lower than 1000 (for performance reasons).
const int accuracy = 100;
const int epsilon = 1;
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
for( const auto& c : cases )
{
BOOST_TEST_CONTEXT( c.m_ctx_name )
{
const SHAPE_ARC this_arc{ c.m_geom.m_center_point, c.m_geom.m_start_point,
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
c.m_geom.m_center_angle, width };
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
const SHAPE_LINE_CHAIN chain = this_arc.ConvertToPolyline( accuracy );
BOOST_TEST_MESSAGE( "Polyline has " << chain.PointCount() << " points" );
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
// Start point (exactly) where expected
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
BOOST_CHECK_EQUAL( chain.CPoint( 0 ), c.m_geom.m_start_point );
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
// End point (exactly) where expected
BOOST_CHECK_EQUAL( chain.CPoint( -1 ), this_arc.GetP1() );
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
int radius = ( c.m_geom.m_center_point - c.m_geom.m_start_point ).EuclideanNorm();
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
// Other points within accuracy + epsilon (for rounding) of where they should be
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
BOOST_CHECK_PREDICATE( ArePolylineEndPointsNearCircle,
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
( chain )( c.m_geom.m_center_point )( radius )( accuracy + epsilon ) );
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
SHAPE_ARC: Expose bug introduced by 5813164d1 in tests The angle needs to be added to the start angle. Add tests to cover this: * Check end point is correct * Check midpoints are within tolerance This would have prevented the bug fixed in 5813164d1, as well as the bug fixed in this commit. As well as failed tests, this manifests when routing across Edge.Cuts arcs (unless they happen to start at 0 degrees staritng angle). Expose as expected failure to prove tests catch it. Fix to follow in separate commit.
2019-04-25 21:19:18 +00:00
BOOST_CHECK_PREDICATE( ArePolylineMidPointsNearCircle,
Fix errors in arc polygonization and test case. 1) Tests can't expect accuracies around 1 to work. PCBNew defaults to 5000. 2) Tests shouldn't artifically expand tolerance just to match the results. 3) Tests should guarantee that end point is on arc, not just close to it. 4) Standard polygonization of a circle is inside so splitting the error needs to increase radius, not decrease. 5) Special-case first and last points so that they're exact.
2020-10-23 21:37:34 +00:00
( chain )( c.m_geom.m_center_point )( radius )( accuracy + epsilon ) );
QA: Test arc to polylines - this has a bug Add unit test of SHAPE_ARC::ConvertToPolyline. This function has a bug when the arc is of zero radius. This test shows the bug, but does not fix it yet.
2019-04-16 18:16:57 +00:00
}
}
}
QA: Add unit test of SHAPE_ARC Test a few "centre-point-angle" cases and add some generic geom code for testing vectors and boxes are within tolerance (since rounding often creeps in). Much of the arc-checking code will be useful to other construction methods (e.g. point-point-point). There are expected failures for the bbox code when the arc passes though, but does not end on, a quadrant point (0, 90, 180, 270). This is due to a defective implementation of SHAPE_ARC::BBox() that does not take into account the quadrant points. This will be fixed as a follow-up.
2019-01-08 17:10:14 +00:00
BOOST_AUTO_TEST_SUITE_END()