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

Fix iterator bug in group selection filtering. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5804
This commit is contained in:
Jeff Young 2020-10-08 14:09:16 +01:00
parent 9c6977a994
commit 80ba02caf5
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcbnew/tools/edit_tool.cpp
View File

@ -1311,13 +1311,14 @@ int EDIT_TOOL::MoveExact( const TOOL_EVENT& aEvent )
m_commit->Modify( item );
if( item->Type() == PCB_GROUP_T )
{
static_cast<PCB_GROUP*>( item )->RunOnDescendants(
[&]( BOARD_ITEM* bItem )
{
m_commit->Modify( bItem );
});
}
{
PCB_GROUP* group = static_cast<PCB_GROUP*>( item );
group->RunOnDescendants( [&]( BOARD_ITEM* bItem )
{
m_commit->Modify( bItem );
});
}
}
item->Move( translation );

17
pcbnew/tools/selection_tool.cpp
View File

@ -2576,23 +2576,28 @@ void SELECTION_TOOL::FilterCollectorForGroups( GENERAL_COLLECTOR& aCollector ) c
std::unordered_set<BOARD_ITEM*> toAdd;
// If any element is a member of a group, replace those elements with the top containing group.
for( int j = 0; j < aCollector.GetCount(); ++j )
for( int j = 0; j < aCollector.GetCount(); )
{
PCB_GROUP* aTop = PCB_GROUP::TopLevelGroup( aCollector[j], m_enteredGroup );
BOARD_ITEM* item = aCollector[j];
PCB_GROUP* aTop = PCB_GROUP::TopLevelGroup( item, m_enteredGroup );
if( aTop != NULL )
{
if( aTop != aCollector[j] )
if( aTop != item )
{
toAdd.insert( aTop );
aCollector.Remove( aCollector[j] );
aCollector.Remove( item );
continue;
}
}
else if( m_enteredGroup && !PCB_GROUP::WithinScope( aCollector[j], m_enteredGroup ) )
else if( m_enteredGroup && !PCB_GROUP::WithinScope( item, m_enteredGroup ) )
{
// If a group is entered, disallow selections of objects outside the group.
aCollector.Remove( aCollector[j] );
aCollector.Remove( item );
continue;
}
++j;
}
for( BOARD_ITEM* item : toAdd )