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

Allow pads in multi-select mode when nothing else would be selected. 

Fixes https://gitlab.com/kicad/code/kicad/issues/13371
This commit is contained in:
Jeff Young 2023-01-05 17:02:15 +00:00
parent 3d8d27caf3
commit cbe5340d37
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcbnew/tools/pcb_selection_tool.cpp
View File

@ -923,6 +923,7 @@ bool PCB_SELECTION_TOOL::selectMultiple()
selectionRect.Normalize(); selectionRect.Normalize();
GENERAL_COLLECTOR collector; GENERAL_COLLECTOR collector;
GENERAL_COLLECTOR padsCollector;
std::set<BOARD_ITEM*> group_items; std::set<BOARD_ITEM*> group_items;
for( PCB_GROUP* group : board()->Groups() ) for( PCB_GROUP* group : board()->Groups() )
@ -949,14 +950,17 @@ bool PCB_SELECTION_TOOL::selectMultiple()
group_items.emplace( group_item ); group_items.emplace( group_item );
} }
for( auto it = candidates.begin(), it_end = candidates.end(); it != it_end; ++it ) for( const KIGFX::VIEW::LAYER_ITEM_PAIR& candidate : candidates )
{ {
BOARD_ITEM* item = static_cast<BOARD_ITEM*>( it->first ); BOARD_ITEM* item = static_cast<BOARD_ITEM*>( candidate.first );
if( item && Selectable( item ) && item->HitTest( selectionRect, !greedySelection ) if( item && Selectable( item ) && item->HitTest( selectionRect, !greedySelection )
&& ( greedySelection || !group_items.count( item ) ) ) && ( greedySelection || !group_items.count( item ) ) )
{ {
collector.Append( item ); if( item->Type() == PCB_PAD_T && !m_isFootprintEditor )
padsCollector.Append( item );
else
collector.Append( item );
} }
} }
@ -965,6 +969,14 @@ bool PCB_SELECTION_TOOL::selectMultiple()
FilterCollectorForHierarchy( collector, true ); FilterCollectorForHierarchy( collector, true );
// If we selected nothing but pads, allow them to be selected
if( collector.GetCount() == 0 )
{
collector = padsCollector;
FilterCollectedItems( collector, true );
FilterCollectorForHierarchy( collector, true );
}
for( EDA_ITEM* i : collector ) for( EDA_ITEM* i : collector )
{ {
BOARD_ITEM* item = static_cast<BOARD_ITEM*>( i ); BOARD_ITEM* item = static_cast<BOARD_ITEM*>( i );
@ -2547,16 +2559,6 @@ bool PCB_SELECTION_TOOL::Selectable( const BOARD_ITEM* aItem, bool checkVisibili
break; break;
case PCB_PAD_T: case PCB_PAD_T:
// Multiple selection is only allowed in footprint editor mode. In pcbnew, you have to
// select footprint subparts one by one, rather than with a drag selection. This is so
// you can pick up items under an (unlocked) footprint without also moving the
// footprint's sub-parts.
if( !m_isFootprintEditor && !checkVisibilityOnly )
{
if( m_multiple )
return false;
}
pad = static_cast<const PAD*>( aItem ); pad = static_cast<const PAD*>( aItem );
if( pad->GetAttribute() == PAD_ATTRIB::PTH || pad->GetAttribute() == PAD_ATTRIB::NPTH ) if( pad->GetAttribute() == PAD_ATTRIB::PTH || pad->GetAttribute() == PAD_ATTRIB::NPTH )