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

Improve selection logic for sloppy selections.

This commit is contained in:
Jeff Young 2019-05-17 00:48:39 +01:00
parent 5dd71b5563
commit 6b3fe33d6f
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
eeschema/tools/ee_selection_tool.cpp
View File

@ -447,16 +447,8 @@ EDA_ITEM* EE_SELECTION_TOOL::SelectPoint( const VECTOR2I& aWhere, const KICAD_T*
if( !start ) if( !start )
return nullptr; return nullptr;
int thresholdMax = KiROUND( getView()->ToWorld( HITTEST_THRESHOLD_PIXELS ) ); collector.m_Threshold = KiROUND( getView()->ToWorld( HITTEST_THRESHOLD_PIXELS ) );
collector.Collect( start, aFilterList, (wxPoint) aWhere, m_unit, m_convert );
for( int threshold : { 0, thresholdMax/2, thresholdMax } )
{
collector.m_Threshold = threshold;
collector.Collect( start, aFilterList, (wxPoint) aWhere, m_unit, m_convert );
if( collector.GetCount() > 0 )
break;
}
bool anyCollected = collector.GetCount() != 0; bool anyCollected = collector.GetCount() != 0;
@ -512,21 +504,46 @@ EDA_ITEM* EE_SELECTION_TOOL::SelectPoint( const VECTOR2I& aWhere, const KICAD_T*
void EE_SELECTION_TOOL::guessSelectionCandidates( EE_COLLECTOR& collector, const VECTOR2I& aPos ) void EE_SELECTION_TOOL::guessSelectionCandidates( EE_COLLECTOR& collector, const VECTOR2I& aPos )
{ {
// There are certain parent/child and enclosure combinations that can be handled // There are certain parent/child and enclosure combinations that can be handled
// automatically. Since schematics are meant to be human-readable we don't have // automatically.
// all the various overlap and coverage issues that we do in Pcbnew.
if( collector.GetCount() == 2 )
{
EDA_ITEM* a = collector[ 0 ];
EDA_ITEM* b = collector[ 1 ];
if( a->GetParent() == b ) // Prefer a non-sheet to a sheet
collector.Remove( b ); for( int i = 0; collector.GetCount() == 2 && i < 2; ++i )
else if( a == b->GetParent() ) {
collector.Remove( a ); EDA_ITEM* item = collector[ i ];
else if( a->Type() == SCH_SHEET_T && b->Type() != SCH_SHEET_T ) EDA_ITEM* other = collector[ ( i + 1 ) % 2 ];
collector.Remove( a );
else if( b->Type() == SCH_SHEET_T && a->Type() != SCH_SHEET_T ) if( item->Type() != SCH_SHEET_T && other->Type() == SCH_SHEET_T )
collector.Remove( b ); collector.Remove( other );
}
// Prefer a symbol to a pin
for( int i = 0; collector.GetCount() == 2 && i < 2; ++i )
{
EDA_ITEM* item = collector[ i ];
EDA_ITEM* other = collector[ ( i + 1 ) % 2 ];
if( item->Type() == SCH_COMPONENT_T && other->Type() == SCH_PIN_T )
collector.Remove( other );
}
// Prefer an exact hit to a sloppy one
for( int i = 0; collector.GetCount() == 2 && i < 2; ++i )
{
EDA_ITEM* item = collector[ i ];
EDA_ITEM* other = collector[ ( i + 1 ) % 2 ];
if( item->HitTest( (wxPoint) aPos, 0 ) && !other->HitTest( (wxPoint) aPos, 0 ) )
collector.Remove( other );
}
// Prefer a field to a symbol
for( int i = 0; collector.GetCount() == 2 && i < 2; ++i )
{
EDA_ITEM* item = collector[ i ];
EDA_ITEM* other = collector[ ( i + 1 ) % 2 ];
if( item->Type() == SCH_FIELD_T && other->Type() == SCH_COMPONENT_T )
collector.Remove( other );
} }
} }