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

pcbnew: fixed zone filling performance regression 

Fixes: lp:1753224
* https://bugs.launchpad.net/kicad/+bug/1753224
This commit is contained in:
Tomasz Włostowski 2018-03-06 16:05:48 +01:00
parent f2bb398ae6
commit a164f7e2da
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/board_items_to_polygon_shape_transform.cpp
View File

@ -502,19 +502,21 @@ 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);
// The aCircleSegmentsCount parameter is intended for use with small features such as
// pads and vias. It can be way too coarse for larger draw items, such as silkscreen
// drawings, which use this routine for DXF-specific sketch-mode plotting. Scale the
// number of segments by the size of the circle/arc.
if( m_Shape == S_CIRCLE || m_Shape == S_ARC ) if( m_Shape == S_CIRCLE || m_Shape == S_ARC )
{ {
double multiple = (double) GetRadius() / IU_PER_MM; // this is an ugly hack, but I don't want to change the file format now that we are in feature freeze.
if( multiple > 1 ) // the circle to segment count parameter is essentially useless for larger circle/arc shapes as it doesn't provide
{ // sufficient approximation accuracy. Here we compute the necessary number of segments based on
aCircleToSegmentsCount = int( aCircleToSegmentsCount * multiple ); // percentage accuracy required. This is currently mapped to the CircleToSegmentCount parameter: low value (16)
// means 1% accuracy, high - 0.33% acciracy.
double accuracy = aCircleToSegmentsCount == 16 ? 0.01 : 0.0033;
double r = GetRadius();
double step = 180.0 / M_PI * acos( r * ( 1.0 - accuracy ) / r );
aCircleToSegmentsCount = (int) ceil( 360.0 / step );
aCorrectionFactor = 1.0 / cos( M_PI / (aCircleToSegmentsCount * 2) ); aCorrectionFactor = 1.0 / cos( M_PI / (aCircleToSegmentsCount * 2) );
} }
}
switch( m_Shape ) switch( m_Shape )
{ {