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

Repair segment ownership logic for rects and curves. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6847
This commit is contained in:
Jeff Young 2020-12-25 13:11:03 +00:00
parent 9c4d3add15
commit 84ce814037
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcbnew/convert_drawsegment_list_to_polygon.cpp
View File

@ -357,6 +357,11 @@ 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 );
segOwners[ std::make_pair( pts[0], pts[1] ) ] = graphic;
segOwners[ std::make_pair( pts[1], pts[2] ) ] = graphic;
segOwners[ std::make_pair( pts[2], pts[3] ) ] = graphic;
segOwners[ std::make_pair( pts[3], pts[0] ) ] = graphic;
polygonComplete = true; polygonComplete = true;
} }
else if( graphic->GetShape() == S_POLYGON ) else if( graphic->GetShape() == S_POLYGON )
@ -468,6 +473,7 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
// of short lines and put those line segments into the !same! PATH. // of short lines and put those line segments into the !same! PATH.
{ {
wxPoint nextPt; wxPoint nextPt;
bool first = true;
bool reverse = false; bool reverse = false;
// Use the end point furthest away from // Use the end point furthest away from
@ -490,7 +496,12 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
{ {
const wxPoint& pt = graphic->GetBezierPoints()[jj]; const wxPoint& pt = graphic->GetBezierPoints()[jj];
aPolygons.Append( pt ); aPolygons.Append( pt );
if( first )
first = false;
else
segOwners[ std::make_pair( prevPt, pt ) ] = graphic; segOwners[ std::make_pair( prevPt, pt ) ] = graphic;
prevPt = pt; prevPt = pt;
} }
} }
@ -499,7 +510,12 @@ bool ConvertOutlineToPolygon( std::vector<PCB_SHAPE*>& aSegList, SHAPE_POLY_SET&
for( const wxPoint& pt : graphic->GetBezierPoints() ) for( const wxPoint& pt : graphic->GetBezierPoints() )
{ {
aPolygons.Append( pt ); aPolygons.Append( pt );
if( first )
first = false;
else
segOwners[ std::make_pair( prevPt, pt ) ] = graphic; segOwners[ std::make_pair( prevPt, pt ) ] = graphic;
prevPt = pt; prevPt = pt;
} }
} }