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

ConvertOutlineToPolygon() fix another issue for arcs found inside a outline

This commit is contained in:
jean-pierre charras 2020-10-24 10:04:15 +02:00
parent c173ea14b7
commit 442f40fa66
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/convert_drawsegment_list_to_polygon.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2015 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -208,7 +208,6 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
return true; return true;
bool polygonComplete = false; bool polygonComplete = false;
bool selfIntersecting = false;
wxString msg; wxString msg;
PCB_SHAPE* graphic; PCB_SHAPE* graphic;
@ -428,7 +427,8 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
std::swap( pstart, pend ); std::swap( pstart, pend );
} }
for( int step = 1; step<=steps; ++step ) // Create intermediate points between start and end:
for( int step = 1; step < steps; ++step )
{ {
double rotation = ( angle * step ) / steps; double rotation = ( angle * step ) / steps;
wxPoint pt = pstart; wxPoint pt = pstart;
@ -437,6 +437,7 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
aPolygons.Append( pt ); aPolygons.Append( pt );
} }
// Append the last arc end point
aPolygons.Append( pend ); aPolygons.Append( pend );
prevPt = pend; prevPt = pend;
@ -614,9 +615,8 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
break; break;
case S_ARC: case S_ARC:
// Freerouter does not yet understand arcs, so approximate // We do not support arcs in polygons, so approximate an arc with a series of
// an arc with a series of short lines and put those // short lines and put those line segments into the !same! PATH.
// line segments into the !same! PATH.
{ {
wxPoint pstart = graphic->GetArcStart(); wxPoint pstart = graphic->GetArcStart();
wxPoint pend = graphic->GetArcEnd(); wxPoint pend = graphic->GetArcEnd();
@ -633,7 +633,8 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
std::swap( pstart, pend ); std::swap( pstart, pend );
} }
for( int step = 1; step<=steps; ++step ) // Create intermediate points between start and end:
for( int step = 1; step < steps; ++step )
{ {
double rotation = ( angle * step ) / steps; double rotation = ( angle * step ) / steps;
wxPoint pt = pstart; wxPoint pt = pstart;
@ -642,7 +643,8 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
aPolygons.Append( pt, -1, hole ); aPolygons.Append( pt, -1, hole );
} }
aPolygons.Append( pend ); // Append the last arc end point
aPolygons.Append( pend, -1, hole );
prevPt = pend; prevPt = pend;
} }
@ -739,6 +741,8 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
// All of the silliness that follows is to work around the segment iterator // All of the silliness that follows is to work around the segment iterator
// while checking for collisions. // while checking for collisions.
// TODO: Implement proper segment and point iterators that follow std // TODO: Implement proper segment and point iterators that follow std
bool selfIntersecting = false;
for( auto seg1 = aPolygons.IterateSegmentsWithHoles(); seg1; seg1++ ) for( auto seg1 = aPolygons.IterateSegmentsWithHoles(); seg1; seg1++ )
{ {
auto seg2 = seg1; auto seg2 = seg1;