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

Improvements to the SELECTION_TOOL heuristics & sanitization rules.

This commit is contained in:
Maciej Suminski 2015-07-15 14:08:52 +02:00
parent 6a6ea35335
commit 4b45146c46
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/tools/selection_tool.cpp
View File

@ -1306,9 +1306,12 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector ) c
} }
} }
BOOST_FOREACH( BOARD_ITEM* item, rejected ) if( (unsigned) aCollector.GetCount() > rejected.size() ) // do not remove everything
{ {
aCollector.Remove( item ); BOOST_FOREACH( BOARD_ITEM* item, rejected )
{
aCollector.Remove( item );
}
} }
} }
@ -1316,6 +1319,7 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector ) c
bool SELECTION_TOOL::SanitizeSelection() bool SELECTION_TOOL::SanitizeSelection()
{ {
std::set<BOARD_ITEM*> rejected; std::set<BOARD_ITEM*> rejected;
std::set<BOARD_ITEM*> added;
if( !m_editModules ) if( !m_editModules )
{ {
@ -1329,11 +1333,18 @@ bool SELECTION_TOOL::SanitizeSelection()
// case 1: module (or its pads) are locked // case 1: module (or its pads) are locked
if( mod && ( mod->PadsLocked() || mod->IsLocked() ) ) if( mod && ( mod->PadsLocked() || mod->IsLocked() ) )
{
rejected.insert( item ); rejected.insert( item );
if( !mod->IsLocked() && !mod->IsSelected() )
added.insert( mod );
}
// case 2: multi-item selection contains both the module and its pads - remove the pads // case 2: multi-item selection contains both the module and its pads - remove the pads
if( mod && m_selection.items.FindItem( mod ) >= 0 ) if( mod && m_selection.items.FindItem( mod ) >= 0 )
{
rejected.insert( item ); rejected.insert( item );
}
} }
} }
} }
@ -1341,6 +1352,9 @@ bool SELECTION_TOOL::SanitizeSelection()
BOOST_FOREACH( BOARD_ITEM* item, rejected ) BOOST_FOREACH( BOARD_ITEM* item, rejected )
unselect( item ); unselect( item );
BOOST_FOREACH( BOARD_ITEM* item, added )
select( item );
return true; return true;
} }