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

Fix D_PAD::BuildPadShapePolygon() incorrect calculation for custom pad shapes. 

Fixes: lp:1784340
https://bugs.launchpad.net/kicad/+bug/1784340
This commit is contained in:
jean-pierre charras 2018-07-30 12:52:03 +02:00
parent aa340e6b85
commit 5e19ed29b8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/board_items_to_polygon_shape_transform.cpp
View File

@ -758,8 +758,6 @@ void D_PAD::TransformShapeWithClearanceToPolygon( SHAPE_POLY_SET& aCornerBuffer,
/* /*
* Function BuildPadShapePolygon * Function BuildPadShapePolygon
* Build the Corner list of the polygonal shape, * Build the Corner list of the polygonal shape,
@ -779,7 +777,6 @@ void D_PAD::BuildPadShapePolygon( SHAPE_POLY_SET& aCornerBuffer,
case PAD_SHAPE_CIRCLE: case PAD_SHAPE_CIRCLE:
case PAD_SHAPE_OVAL: case PAD_SHAPE_OVAL:
case PAD_SHAPE_ROUNDRECT: case PAD_SHAPE_ROUNDRECT:
case PAD_SHAPE_CUSTOM:
{ {
// We are using TransformShapeWithClearanceToPolygon to build the shape. // We are using TransformShapeWithClearanceToPolygon to build the shape.
// Currently, this method uses only the same inflate value for X and Y dirs. // Currently, this method uses only the same inflate value for X and Y dirs.
@ -806,6 +803,15 @@ void D_PAD::BuildPadShapePolygon( SHAPE_POLY_SET& aCornerBuffer,
} }
break; break;
case PAD_SHAPE_CUSTOM:
// for a custom shape, that is in fact a polygon (with holes), we can use only a inflate value.
// so use ( aInflateValue.x + aInflateValue.y ) / 2 as polygon inflate value.
// (different values for aInflateValue.x and aInflateValue.y has no sense for a custom pad)
TransformShapeWithClearanceToPolygon( aCornerBuffer,
( aInflateValue.x + aInflateValue.y ) / 2,
aSegmentsPerCircle, aCorrectionFactor );
break;
} }
} }

6
pcbnew/plot_board_layers.cpp
View File

@ -825,12 +825,10 @@ void PlotSolderMaskLayer( BOARD *aBoard, PLOTTER* aPlotter,
{ {
// add shapes with exact size // add shapes with exact size
module->TransformPadsShapesWithClearanceToPolygon( layer, module->TransformPadsShapesWithClearanceToPolygon( layer,
initialPolys, 0, initialPolys, 0, circleToSegmentsCount, correction );
circleToSegmentsCount, correction );
// add shapes inflated by aMinThickness/2 // add shapes inflated by aMinThickness/2
module->TransformPadsShapesWithClearanceToPolygon( layer, module->TransformPadsShapesWithClearanceToPolygon( layer,
areas, inflate, areas, inflate, circleToSegmentsCount, correction );
circleToSegmentsCount, correction );
} }
// Plot vias on solder masks, if aPlotOpt.GetPlotViaOnMaskLayer() is true, // Plot vias on solder masks, if aPlotOpt.GetPlotViaOnMaskLayer() is true,