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

Gerber plotter: ensure filled areas using thick outlines have a closed outline. 

Fixes #8735
https://gitlab.com/kicad/code/kicad/issues/8735
This commit is contained in:
jean-pierre charras 2021-07-06 13:57:47 +02:00
parent ec64e8ad5b
commit cd476e1728
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/plot_brditems_plotter.cpp
View File

@ -805,6 +805,17 @@ void BRDITEMS_PLOTTER::PlotFilledAreas( const ZONE* aZone, const SHAPE_POLY_SET&
{ {
m_plotter->PlotPoly( outline, FILL_TYPE::NO_FILL, m_plotter->PlotPoly( outline, FILL_TYPE::NO_FILL,
outline_thickness, &gbr_metadata ); outline_thickness, &gbr_metadata );
// Ensure the outline is closed:
int last_idx = outline.PointCount() - 1;
if( outline.CPoint( 0 ) != outline.CPoint( last_idx ) )
{
m_plotter->ThickSegment( wxPoint( outline.CPoint( 0 ) ),
wxPoint( outline.CPoint( last_idx ) ),
outline_thickness,
GetPlotMode(), &gbr_metadata );
}
} }
static_cast<GERBER_PLOTTER*>( m_plotter )->PlotGerberRegion( static_cast<GERBER_PLOTTER*>( m_plotter )->PlotGerberRegion(
@ -820,13 +831,24 @@ void BRDITEMS_PLOTTER::PlotFilledAreas( const ZONE* aZone, const SHAPE_POLY_SET&
{ {
if( outline_thickness ) if( outline_thickness )
{ {
for( int jj = 1; jj < outline.PointCount(); jj++ ) int last_idx = outline.PointCount() - 1;
for( int jj = 1; jj <= last_idx; jj++ )
{ {
m_plotter->ThickSegment( wxPoint( outline.CPoint( jj - 1) ), m_plotter->ThickSegment( wxPoint( outline.CPoint( jj - 1) ),
wxPoint( outline.CPoint( jj ) ), wxPoint( outline.CPoint( jj ) ),
outline_thickness, outline_thickness,
GetPlotMode(), &gbr_metadata ); GetPlotMode(), &gbr_metadata );
} }
// Ensure the outline is closed:
if( outline.CPoint( 0 ) != outline.CPoint( last_idx ) )
{
m_plotter->ThickSegment( wxPoint( outline.CPoint( 0 ) ),
wxPoint( outline.CPoint( last_idx ) ),
outline_thickness,
GetPlotMode(), &gbr_metadata );
}
} }
m_plotter->SetCurrentLineWidth( -1 ); m_plotter->SetCurrentLineWidth( -1 );