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

ClearArcs before calling SHAPE_POLY_SET boolean ops.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/21209
This commit is contained in:
Jeff Young
2025-06-30 15:47:54 -06:00
parent fc0bf1e8bd
commit 21c9364063
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/zone.cpp
+13 -5
View File
@@ -1406,6 +1406,8 @@ bool ZONE::BuildSmoothedPoly( SHAPE_POLY_SET& aSmoothedPoly, PCB_LAYER_ID aLayer
// (And we wouldn't need to collect all the diffNetIntersectingZones either.)
SHAPE_POLY_SET sameNetPoly = sameNetZone->Outline()->CloneDropTriangulation();
sameNetPoly.ClearArcs();
SHAPE_POLY_SET diffNetPoly;
// Of course there's always a wrinkle. The same-net intersecting zone *might* get knocked
@@ -1415,7 +1417,10 @@ bool ZONE::BuildSmoothedPoly( SHAPE_POLY_SET& aSmoothedPoly, PCB_LAYER_ID aLayer
if( diffNetZone->HigherPriority( sameNetZone )
&& diffNetZone->GetBoundingBox().Intersects( sameNetBoundingBox ) )
{
diffNetPoly.BooleanAdd( *diffNetZone->Outline() );
SHAPE_POLY_SET diffNetOutline = diffNetZone->Outline()->CloneDropTriangulation();
diffNetOutline.ClearArcs();
diffNetPoly.BooleanAdd( diffNetOutline );
}
}
@@ -1427,20 +1432,23 @@ bool ZONE::BuildSmoothedPoly( SHAPE_POLY_SET& aSmoothedPoly, PCB_LAYER_ID aLayer
if( diffNetPoly.OutlineCount() )
{
SHAPE_POLY_SET thisPoly = Outline()->CloneDropTriangulation();
thisPoly.ClearArcs();
thisPoly.BooleanSubtract( diffNetPoly );
isolated = thisPoly.OutlineCount() == 0;
}
if( !isolated )
{
sameNetPoly.ClearArcs();
aSmoothedPoly.BooleanAdd( sameNetPoly );
}
}
if( aBoardOutline )
aSmoothedPoly.BooleanIntersection( *aBoardOutline );
{
SHAPE_POLY_SET boardOutline = aBoardOutline->CloneDropTriangulation();
boardOutline.ClearArcs();
aSmoothedPoly.BooleanIntersection( boardOutline );
}
SHAPE_POLY_SET withSameNetIntersectingZones = aSmoothedPoly.CloneDropTriangulation();