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

fix a few issues in ConvertOutlineToPolygon(). 

Fixes #6130
https://gitlab.com/kicad/code/kicad/issues/6130
Fixes #6129
https://gitlab.com/kicad/code/kicad/issues/6129
This commit is contained in:
jean-pierre charras 2020-10-23 11:23:45 +02:00
parent 15369915cc
commit 51be98428d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/convert_drawsegment_list_to_polygon.cpp
View File

@ -344,6 +344,7 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
{ {
TransformCircleToPolygon( aPolygons, graphic->GetCenter(), graphic->GetRadius(), TransformCircleToPolygon( aPolygons, graphic->GetCenter(), graphic->GetRadius(),
ARC_LOW_DEF, ERROR_INSIDE ); ARC_LOW_DEF, ERROR_INSIDE );
polygonComplete = true;
} }
else if( graphic->GetShape() == S_RECT ) else if( graphic->GetShape() == S_RECT )
{ {
@ -353,6 +354,8 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
for( const wxPoint& pt : pts ) for( const wxPoint& pt : pts )
aPolygons.Append( pt ); aPolygons.Append( pt );
polygonComplete = true;
} }
else if( graphic->GetShape() == S_POLYGON ) else if( graphic->GetShape() == S_POLYGON )
{ {
@ -416,7 +419,6 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
double angle = -graphic->GetAngle(); double angle = -graphic->GetAngle();
double radius = graphic->GetRadius(); double radius = graphic->GetRadius();
int steps = GetArcToSegmentCount( radius, aTolerance, angle / 10.0 ); int steps = GetArcToSegmentCount( radius, aTolerance, angle / 10.0 );
double delta = angle / steps;
if( !close_enough( prevPt, pstart, aTolerance ) ) if( !close_enough( prevPt, pstart, aTolerance ) )
{ {
@ -426,8 +428,9 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
std::swap( pstart, pend ); std::swap( pstart, pend );
} }
for( double rotation = delta; rotation < angle; rotation += delta ) for( int step = 1; step<=steps; ++step )
{ {
double rotation = ( angle * step ) / steps;
wxPoint pt = pstart; wxPoint pt = pstart;
RotatePoint( &pt, pcenter, rotation ); RotatePoint( &pt, pcenter, rotation );
@ -621,7 +624,6 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
double angle = -graphic->GetAngle(); double angle = -graphic->GetAngle();
int radius = graphic->GetRadius(); int radius = graphic->GetRadius();
int steps = GetArcToSegmentCount( radius, aTolerance, angle / 10.0 ); int steps = GetArcToSegmentCount( radius, aTolerance, angle / 10.0 );
double delta = angle / steps;
if( !close_enough( prevPt, pstart, aTolerance ) ) if( !close_enough( prevPt, pstart, aTolerance ) )
{ {
@ -631,8 +633,9 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
std::swap( pstart, pend ); std::swap( pstart, pend );
} }
for( double rotation = delta; rotation < angle; rotation += delta ) for( int step = 1; step<=steps; ++step )
{ {
double rotation = ( angle * step ) / steps;
wxPoint pt = pstart; wxPoint pt = pstart;
RotatePoint( &pt, pcenter, rotation ); RotatePoint( &pt, pcenter, rotation );