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

Refinement in circle to segment approximation for clearance area of DRAWSEGMENTS

This commit is contained in:
jean-pierre charras 2018-03-09 15:56:00 +01:00
parent 30a78f00bc
commit 52ab6216c0
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/board_items_to_polygon_shape_transform.cpp
View File

@ -509,22 +509,25 @@ void DRAWSEGMENT::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerB
// The full width of the lines to create: // The full width of the lines to create:
int linewidth = m_Width + (2 * aClearanceValue); int linewidth = m_Width + (2 * aClearanceValue);
// Creating a reliable clearance shape for circles and arcs is not so easy, due to
// the error created by segment approximation.
// for a cicle this is not so hard: create a polygon from a circle slightly bigger:
// thickness = linewidth + s_error_max, and radius = initial radius + s_error_max/2
// giving a shape with a suitable internal radius and external radius
// For an arc this is more tricky: TODO
if( m_Shape == S_CIRCLE || m_Shape == S_ARC ) if( m_Shape == S_CIRCLE || m_Shape == S_ARC )
{ {
int segCount = GetArcToSegmentCount( GetRadius(), s_error_max, 360.0 ); int segCount = GetArcToSegmentCount( GetRadius(), s_error_max, 360.0 );
if( segCount > aCircleToSegmentsCount ) if( segCount > aCircleToSegmentsCount )
{
aCircleToSegmentsCount = segCount; aCircleToSegmentsCount = segCount;
aCorrectionFactor = GetCircletoPolyCorrectionFactor( aCircleToSegmentsCount );
}
} }
switch( m_Shape ) switch( m_Shape )
{ {
case S_CIRCLE: case S_CIRCLE:
TransformRingToPolygon( aCornerBuffer, GetCenter(), GetRadius(), TransformRingToPolygon( aCornerBuffer, GetCenter(), GetRadius() + (s_error_max/2),
aCircleToSegmentsCount, linewidth ) ; aCircleToSegmentsCount, linewidth + s_error_max ) ;
break; break;
case S_ARC: case S_ARC:

12
pcbnew/convert_drawsegment_list_to_polygon.cpp
View File

@ -38,6 +38,12 @@
#include <geometry/geometry_utils.h> #include <geometry/geometry_utils.h>
// Error max when converting a circle or arc to segments.
// Avoid too small values that create a very long calculation time
// in zone fillings
#define ARC_ACCURACY ( 0.05 * IU_PER_MM )
/** /**
* Function close_ness * Function close_ness
* is a non-exact distance (also called Manhattan distance) used to approximate * is a non-exact distance (also called Manhattan distance) used to approximate
@ -168,12 +174,6 @@ static DRAWSEGMENT* findPoint( const wxPoint& aPoint, std::vector< DRAWSEGMENT*
} }
// Error max when converting a circle or arc to segments.
// Avoid too small values that create a very long calculation time
// in zone fillings
#define ARC_ACCURACY ( 0.05 * IU_PER_MM )
/** /**
* Function ConvertOutlineToPolygon * Function ConvertOutlineToPolygon
* build a polygon (with holes) from a DRAWSEGMENT list, which is expected to be * build a polygon (with holes) from a DRAWSEGMENT list, which is expected to be