AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-04 23:05:30 +00:00
Files Issues Releases Activity

Add additional handling for arc collisions

Browse Source 
Provides nearest point calculation for circles, segments and rects

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18203
This commit is contained in:
Seth Hillbrand 2025-01-14 12:16:13 -08:00
parent bcebc694b8
commit bfb3875a68
8 changed files with 494 additions and 18 deletions
libs/kimath
include
geometry
shape_arc.h
math
box2.h
src/geometry
shape_arc.cppshape_collisions.cpp
pcbnew/router
pns_line_placer.cpp
qa
data/pcbnew
issue18203.kicad_pcb
tests
libs/kimath/math
test_box2.cpp
pcbnew/drc
test_drc_regressions.cpp

33
libs/kimath/include/geometry/shape_arc.h
View File

@ -32,7 +32,9 @@
#include <geometry/eda_angle.h>
class CIRCLE;
class SHAPE_CIRCLE;
class SHAPE_LINE_CHAIN;
class SHAPE_RECT;
class SHAPE_ARC : public SHAPE
{
@ -120,7 +122,6 @@ public:
VECTOR2I NearestPoint( const VECTOR2I& aP ) const;
/**
* Compute closest points between this arc and \a aArc.
*
@ -131,6 +132,36 @@ public:
*/
bool NearestPoints( const SHAPE_ARC& aArc, VECTOR2I& aPtA, VECTOR2I& aPtB, int64_t& aDistSq ) const;
/**
* Compute closest points between this arc and \a aCircle.
*
* @param aPtA point on this arc (output)
* @param aPtB point on the circle (output)
* @param aDistSq squared distance between points (output)
* @return true if the operation was successful
*/
bool NearestPoints( const SHAPE_CIRCLE& aCircle, VECTOR2I& aPtA, VECTOR2I& aPtB, int64_t& aDistSq ) const;
/**
* Compute closest points between this arc and \a aSeg.
*
* @param aPtA point on this arc (output)
* @param aPtB point on the segment (output)
* @param aDistSq squared distance between points (output)
* @return true if the operation was successful
*/
bool NearestPoints( const SEG& aSeg, VECTOR2I& aPtA, VECTOR2I& aPtB, int64_t& aDistSq ) const;
/**
* Compute closest points between this arc and \a aRect.
*
* @param aPtA point on this arc (output)
* @param aPtB point on the rectangle (output)
* @param aDistSq squared distance between points (output)
* @return true if the operation was successful
*/
bool NearestPoints( const SHAPE_RECT& aRect, VECTOR2I& aPtA, VECTOR2I& aPtB, int64_t& aDistSq ) const;
bool Collide( const SEG& aSeg, int aClearance = 0, int* aActual = nullptr,
VECTOR2I* aLocation = nullptr ) const override;
bool Collide( const VECTOR2I& aP, int aClearance = 0, int* aActual = nullptr,

4
libs/kimath/include/math/box2.h
View File

@ -506,7 +506,7 @@ public:
if( !m_init )
return false;
Vec closest = ClosestPointTo( aCenter );
Vec closest = NearestPoint( aCenter );
double dx = static_cast<double>( aCenter.x ) - closest.x;
double dy = static_cast<double>( aCenter.y ) - closest.y;
@ -848,7 +848,7 @@ public:
/**
* Return the point in this rect that is closest to the provided point
*/
constexpr Vec ClosestPointTo( const Vec& aPoint ) const
constexpr Vec NearestPoint( const Vec& aPoint ) const
{
BOX2<Vec> me( *this );

180
libs/kimath/src/geometry/shape_arc.cpp
View File

@ -29,6 +29,7 @@
#include <geometry/shape_arc.h>
#include <geometry/shape_circle.h>
#include <geometry/shape_line_chain.h>
#include <geometry/shape_rect.h>
#include <convert_basic_shapes_to_polygon.h>
#include <trigo.h>
@ -446,6 +447,185 @@ VECTOR2I SHAPE_ARC::NearestPoint( const VECTOR2I& aP ) const
}
bool SHAPE_ARC::NearestPoints( const SHAPE_CIRCLE& aCircle, VECTOR2I& aPtA, VECTOR2I& aPtB,
int64_t& aDistSq ) const
{
if( GetCenter() == aCircle.GetCenter() && GetRadius() == aCircle.GetRadius() )
{
aPtA = aPtB = GetP0();
aDistSq = 0;
return true;
}
aDistSq = std::numeric_limits<int64_t>::max();
CIRCLE circle1( GetCenter(), GetRadius() );
CIRCLE circle2( aCircle.GetCircle() );
std::vector<VECTOR2I> intersections = circle1.Intersect( circle2 );
for( const VECTOR2I& pt : intersections )
{
if( sliceContainsPoint( pt ) )
{
aPtA = aPtB = pt;
aDistSq = 0;
return true;
}
}
std::vector<VECTOR2I> pts = { m_start, m_end, circle1.NearestPoint( GetCenter() ) };
for( const VECTOR2I& pt : pts )
{
if( sliceContainsPoint( pt ) )
{
VECTOR2I nearestPt2 = circle2.NearestPoint( pt );
int64_t distSq = pt.SquaredDistance( nearestPt2 );
if( distSq < aDistSq )
{
aDistSq = distSq;
aPtA = pt;
aPtB = nearestPt2;
}
}
}
return true;
}
bool SHAPE_ARC::NearestPoints( const SEG& aSeg, VECTOR2I& aPtA, VECTOR2I& aPtB,
int64_t& aDistSq ) const
{
aDistSq = std::numeric_limits<int64_t>::max();
CIRCLE circle( GetCenter(), GetRadius() );
// First check for intersections on the circle
std::vector<VECTOR2I> intersections = circle.Intersect( aSeg );
for( const VECTOR2I& pt : intersections )
{
if( sliceContainsPoint( pt ) )
{
aPtA = aPtB = pt;
aDistSq = 0;
return true;
}
}
// Check the endpoints of the segment against the nearest point on the arc
for( const VECTOR2I& pt : { aSeg.A, aSeg.B } )
{
if( sliceContainsPoint( pt ) )
{
VECTOR2I nearestPt = circle.NearestPoint( pt );
int64_t distSq = pt.SquaredDistance( nearestPt );
if( distSq < aDistSq )
{
aDistSq = distSq;
aPtA = nearestPt;
aPtB = pt;
}
}
}
// Check the endpoints of the arc against the nearest point on the segment
for( const VECTOR2I& pt : { m_start, m_end } )
{
VECTOR2I nearestPt = aSeg.NearestPoint( pt );
int64_t distSq = pt.SquaredDistance( nearestPt );
if( distSq < aDistSq )
{
aDistSq = distSq;
aPtA = pt;
aPtB = nearestPt;
}
}
// Check the closest points on the segment to the circle
VECTOR2I segNearestPt = aSeg.NearestPoint( GetCenter() );
if( sliceContainsPoint( segNearestPt ) )
{
VECTOR2I circleNearestPt = circle.NearestPoint( segNearestPt );
int64_t distSq = segNearestPt.SquaredDistance( circleNearestPt );
if( distSq < aDistSq )
{
aDistSq = distSq;
aPtA = segNearestPt;
aPtB = circleNearestPt;
}
}
return true;
}
bool SHAPE_ARC::NearestPoints( const SHAPE_RECT& aRect, VECTOR2I& aPtA, VECTOR2I& aPtB,
int64_t& aDistSq ) const
{
BOX2I bbox = aRect.BBox();
CIRCLE circle( GetCenter(), GetRadius() );
aDistSq = std::numeric_limits<int64_t>::max();
// First check for intersections
SHAPE_LINE_CHAIN lineChain( aRect.Outline() );
for( int i = 0; i < 4; ++i )
{
SEG seg( lineChain.CPoint( i ), lineChain.CPoint( i + 1 ) );
std::vector<VECTOR2I> intersections = circle.Intersect( seg );
for( const VECTOR2I& pt : intersections )
{
if( sliceContainsPoint( pt ) )
{
aPtA = aPtB = pt;
aDistSq = 0;
return true;
}
}
}
// Check the endpoints of the arc against the nearest point on the rectangle
for( const VECTOR2I& pt : { m_start, m_end } )
{
VECTOR2I nearestPt = bbox.NearestPoint( pt );
int64_t distSq = pt.SquaredDistance( nearestPt );
if( distSq < aDistSq )
{
aDistSq = distSq;
aPtA = pt;
aPtB = nearestPt;
}
}
// Check the closest points on the rectangle to the circle
VECTOR2I rectNearestPt = bbox.NearestPoint( GetCenter() );
if( sliceContainsPoint( rectNearestPt ) )
{
VECTOR2I circleNearestPt = circle.NearestPoint( rectNearestPt );
int64_t distSq = rectNearestPt.SquaredDistance( circleNearestPt );
if( distSq < aDistSq )
{
aDistSq = distSq;
aPtA = rectNearestPt;
aPtB = circleNearestPt;
}
}
return true;
}
bool SHAPE_ARC::NearestPoints( const SHAPE_ARC& aArc, VECTOR2I& aPtA, VECTOR2I& aPtB,
int64_t& aDistSq ) const
{

26
libs/kimath/src/geometry/shape_collisions.cpp
View File

@ -548,14 +548,30 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_RECT& aB, int aClea
static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_CIRCLE& aB, int aClearance,
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{
const SHAPE_LINE_CHAIN lc( aA );
VECTOR2I ptA, ptB;
int64_t dist_sq = std::numeric_limits<int64_t>::max();
aA.NearestPoints( aB, ptA, ptB, dist_sq );
int half_width = ( aA.GetWidth() + 1 ) / 2;
int min_dist = aClearance + half_width;
bool rv = Collide( aB, lc, aClearance + aA.GetWidth() / 2, aActual, aLocation, aMTV );
if( dist_sq < SEG::Square( min_dist ) )
{
if( aLocation )
*aLocation = ( ptA + ptB ) / 2;
if( rv && aActual )
*aActual = std::max( 0, *aActual - aA.GetWidth() / 2 );
if( aActual )
*aActual = std::max( 0, KiROUND( std::sqrt( dist_sq ) - half_width ) );
return rv;
if( aMTV )
{
const VECTOR2I delta = ptB - ptA;
*aMTV = delta.Resize( min_dist - std::sqrt( dist_sq ) + 3 );
}
return true;
}
return false;
}

2
pcbnew/router/pns_line_placer.cpp
View File

@ -831,7 +831,7 @@ bool LINE_PLACER::rhMarkObstacles( const VECTOR2I& aP, LINE& aNewHead, LINE& aNe
DIRECTION_45::CORNER_MODE cornerMode = Settings().GetCornerMode();
if( cornerMode == DIRECTION_45::MITERED_90 || cornerMode == DIRECTION_45::ROUNDED_90 )
nearest = hull.BBox().ClosestPointTo( aP );
nearest = hull.BBox().NearestPoint( aP );
else
nearest = hull.NearestPoint( aP );

qa/data/pcbnew/issue18203.kicad_pcb
Normal file
View File

LOADING design file

18
qa/tests/libs/kimath/math/test_box2.cpp
View File

@ -119,31 +119,31 @@ BOOST_AUTO_TEST_CASE( test_closest_point_to, *boost::unit_test::tolerance( 0.000
// check all quadrants
// top left
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 0, 0 ) ) == VECTOR2D( 1, 2 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 0, 0 ) ) == VECTOR2D( 1, 2 ) );
// top
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 2, 0 ) ) == VECTOR2D( 2, 2 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 2, 0 ) ) == VECTOR2D( 2, 2 ) );
// top right
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 6, 0 ) ) == VECTOR2D( 4, 2 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 6, 0 ) ) == VECTOR2D( 4, 2 ) );
// right
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 6, 5 ) ) == VECTOR2D( 4, 5 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 6, 5 ) ) == VECTOR2D( 4, 5 ) );
// bottom right
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 6, 7 ) ) == VECTOR2D( 4, 6 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 6, 7 ) ) == VECTOR2D( 4, 6 ) );
// bottom
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 3, 7 ) ) == VECTOR2D( 3, 6 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 3, 7 ) ) == VECTOR2D( 3, 6 ) );
// bottom left
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 0, 7 ) ) == VECTOR2D( 1, 6 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 0, 7 ) ) == VECTOR2D( 1, 6 ) );
// left
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 0, 3 ) ) == VECTOR2D( 1, 3 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 0, 3 ) ) == VECTOR2D( 1, 3 ) );
// inside
BOOST_TEST( box.ClosestPointTo( VECTOR2D( 2, 4 ) ) == VECTOR2D( 2, 4 ) );
BOOST_TEST( box.NearestPoint( VECTOR2D( 2, 4 ) ) == VECTOR2D( 2, 4 ) );
}
BOOST_AUTO_TEST_CASE( test_farthest_point_to, *boost::unit_test::tolerance( 0.000001 ) )

1
qa/tests/pcbnew/drc/test_drc_regressions.cpp
View File

@ -66,6 +66,7 @@ BOOST_FIXTURE_TEST_CASE( DRCFalsePositiveRegressions, DRC_REGRESSION_TEST_FIXTUR
"issue15280", // Very wide spokes mis-counted as being single spoke
"issue14008", // Net-tie clearance error
"issue17967/issue17967", // Arc dp coupling
"issue18203", // DRC error due to colliding arc and circle
"unconnected-netnames/unconnected-netnames", // Raised false schematic partity error
};