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

Restore unique-item filtering when collecting nearby items from view. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12076
This commit is contained in:
Jeff Young 2022-07-23 15:09:16 +01:00
parent cb77e68076
commit f48755cc67
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
eeschema/tools/ee_selection_tool.cpp
View File

@ -1275,24 +1275,26 @@ bool EE_SELECTION_TOOL::selectMultiple()
view->Query( area.ViewBBox(), nearbyViewItems ); view->Query( area.ViewBBox(), nearbyViewItems );
// Build lists of nearby items and their children // Build lists of nearby items and their children
std::vector<EDA_ITEM*> nearbyItems; std::unordered_set<EDA_ITEM*> nearbyItems;
std::vector<EDA_ITEM*> nearbyChildren; std::vector<EDA_ITEM*> nearbyChildren;
std::vector<EDA_ITEM*> flaggedItems; std::vector<EDA_ITEM*> flaggedItems;
for( KIGFX::VIEW::LAYER_ITEM_PAIR& pair : nearbyViewItems ) for( KIGFX::VIEW::LAYER_ITEM_PAIR& pair : nearbyViewItems )
{ {
if( EDA_ITEM* item = dynamic_cast<EDA_ITEM*>( pair.first ) ) if( EDA_ITEM* item = dynamic_cast<EDA_ITEM*>( pair.first ) )
{ {
item->ClearFlags( CANDIDATE ); if( nearbyItems.insert( item ).second )
nearbyItems.push_back( item );
if( SCH_ITEM* sch_item = dynamic_cast<SCH_ITEM*>( item ) )
{ {
sch_item->RunOnChildren( item->ClearFlags( CANDIDATE );
[&]( SCH_ITEM* aChild )
{ if( SCH_ITEM* sch_item = dynamic_cast<SCH_ITEM*>( item ) )
nearbyChildren.push_back( aChild ); {
} ); sch_item->RunOnChildren(
[&]( SCH_ITEM* aChild )
{
nearbyChildren.push_back( aChild );
} );
}
} }
} }
} }