realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pcbnew: polygon boolean ops: clear arcs first to avoid assert

Browse Source
This commit is contained in:
John Beard 2025-07-09 19:14:55 +08:00
parent 563bb7a538
commit f36af7e08a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/tools/item_modification_routine.cpp
View File

@ -488,6 +488,9 @@ void POLYGON_BOOLEAN_ROUTINE::ProcessShape( PCB_SHAPE& aPcbShape )
m_workingPolygons = std::move( *poly );
m_firstPolygon = false;
// Boolean ops work, but assert on arcs
m_workingPolygons.ClearArcs();
GetHandler().DeleteItem( aPcbShape );
}
else
@ -560,7 +563,10 @@ std::optional<wxString> POLYGON_MERGE_ROUTINE::GetStatusMessage() const
bool POLYGON_MERGE_ROUTINE::ProcessSubsequentPolygon( const SHAPE_POLY_SET& aPolygon )
{
GetWorkingPolygons().BooleanAdd( aPolygon );
SHAPE_POLY_SET no_arcs_poly = aPolygon;
no_arcs_poly.ClearArcs();
GetWorkingPolygons().BooleanAdd( no_arcs_poly );
return true;
}
@ -586,7 +592,11 @@ bool POLYGON_SUBTRACT_ROUTINE::ProcessSubsequentPolygon( const SHAPE_POLY_SET& a
{
SHAPE_POLY_SET& working_polygons = GetWorkingPolygons();
SHAPE_POLY_SET working_copy = working_polygons;
working_copy.BooleanSubtract( aPolygon );
SHAPE_POLY_SET no_arcs_poly = aPolygon;
no_arcs_poly.ClearArcs();
working_copy.BooleanSubtract( no_arcs_poly );
working_polygons = std::move( working_copy );
return true;
@ -614,7 +624,11 @@ bool POLYGON_INTERSECT_ROUTINE::ProcessSubsequentPolygon( const SHAPE_POLY_SET&
{
SHAPE_POLY_SET& working_polygons = GetWorkingPolygons();
SHAPE_POLY_SET working_copy = working_polygons;
working_copy.BooleanIntersection( aPolygon );
SHAPE_POLY_SET no_arcs_poly = aPolygon;
no_arcs_poly.ClearArcs();
working_copy.BooleanIntersection( no_arcs_poly );
// Is there anything left?
if( working_copy.OutlineCount() == 0 )