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

Fix zone merge intersection algorithm. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11492
This commit is contained in:
Jeff Young 2022-04-29 18:29:28 +01:00
parent 9fbf8e6f5d
commit 5f10c15a87
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcbnew/tools/board_editor_control.cpp
View File

@ -1465,7 +1465,18 @@ int BOARD_EDITOR_CONTROL::ZoneMerge( const TOOL_EVENT& aEvent )
continue; continue;
} }
if( !board->TestZoneIntersection( curr_area, firstZone ) ) bool intersects = curr_area == firstZone;
for( ZONE* candidate : toMerge )
{
if( intersects )
break;
if( board->TestZoneIntersection( curr_area, candidate ) )
intersects = true;
}
if( !intersects )
{ {
wxLogMessage( _( "Some zones did not intersect and were not merged." ) ); wxLogMessage( _( "Some zones did not intersect and were not merged." ) );
continue; continue;
@ -1476,12 +1487,15 @@ int BOARD_EDITOR_CONTROL::ZoneMerge( const TOOL_EVENT& aEvent )
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
if( mergeZones( m_frame, commit, toMerge, merged ) ) if( !toMerge.empty() )
{ {
commit.Push( wxT( "Merge zones" ) ); if( mergeZones( m_frame, commit, toMerge, merged ) )
{
commit.Push( wxT( "Merge zones" ) );
for( EDA_ITEM* item : merged ) for( EDA_ITEM* item : merged )
m_toolMgr->RunAction( PCB_ACTIONS::selectItem, true, item ); m_toolMgr->RunAction( PCB_ACTIONS::selectItem, true, item );
}
} }
return 0; return 0;