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

Schematic: re-allow partial selection of line ends 

Also fix some XOR selecting issues.

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13022
This commit is contained in:
Mike Williams 2022-12-10 13:16:28 -05:00
parent 75f1067642
commit f4fb70e04c
2 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
eeschema/tools/ee_selection_tool.cpp
View File

@ -1360,35 +1360,27 @@ bool EE_SELECTION_TOOL::selectMultiple()
bool anySubtracted = false;
auto selectItem =
[&]( EDA_ITEM* aItem )
[&]( EDA_ITEM* aItem, EDA_ITEM_FLAGS flags )
{
EDA_ITEM_FLAGS flags = 0;
// Handle line ends specially
if( aItem->Type() == SCH_LINE_T )
{
SCH_LINE* line = (SCH_LINE*) aItem;
if( selectionRect.Contains( line->GetStartPoint() ) || isGreedy )
flags |= STARTPOINT;
if( selectionRect.Contains( line->GetEndPoint() ) || isGreedy )
flags |= ENDPOINT;
// If no ends were selected, select whole line (both ends)
if( !( flags & STARTPOINT ) && !( flags & ENDPOINT ) )
flags = STARTPOINT | ENDPOINT;
}
if( m_subtractive || ( m_exclusive_or && aItem->IsSelected() ) )
{
aItem->ClearFlags( flags );
if ( m_exclusive_or )
aItem->XorFlags( flags );
else
aItem->ClearFlags( flags );
if( !aItem->HasFlag( STARTPOINT ) && !aItem->HasFlag( ENDPOINT ) )
{
unselect( aItem );
anySubtracted = true;
}
// We changed one line endpoint on a selected line,
// update the view at least.
if( flags && !anySubtracted )
{
getView()->Update( aItem );
}
}
else
{
@ -1400,14 +1392,56 @@ bool EE_SELECTION_TOOL::selectMultiple()
for( EDA_ITEM* item : nearbyItems )
{
bool selected = false;
EDA_ITEM_FLAGS flags = 0;
if( m_frame->GetRenderSettings()->m_ShowPinsElectricalType )
item->SetFlags( SHOW_ELEC_TYPE );
if( Selectable( item ) && item->HitTest( selectionRect, !isGreedy ) )
if( Selectable( item ) )
{
if( item->Type() == SCH_LINE_T )
{
SCH_LINE* line = static_cast<SCH_LINE*>( item );
if( isGreedy && line->HitTest( selectionRect, false ) )
{
selected = true;
flags |= STARTPOINT | ENDPOINT;
}
else if( !isGreedy )
{
if( selectionRect.Contains( line->GetStartPoint() ) )
{
selected = true;
flags |= STARTPOINT;
}
if( selectionRect.Contains( line->GetEndPoint() ) )
{
selected = true;
flags |= ENDPOINT;
}
if( ( selected && selectionRect.Contains( line->GetMidPoint() ) )
|| ( !selected && line->HitTest( selectionRect, false ) ) )
{
selected = true;
flags |= STARTPOINT | ENDPOINT;
}
}
}
else
{
selected = item->HitTest( selectionRect, !isGreedy );
}
}
if( selected )
{
item->SetFlags( CANDIDATE );
flaggedItems.push_back( item );
selectItem( item );
selectItem( item, flags );
}
item->ClearFlags( SHOW_ELEC_TYPE );
@ -1422,7 +1456,7 @@ bool EE_SELECTION_TOOL::selectMultiple()
&& !item->GetParent()->HasFlag( CANDIDATE )
&& item->HitTest( selectionRect, !isGreedy ) )
{
selectItem( item );
selectItem( item, 0 );
}
item->ClearFlags( SHOW_ELEC_TYPE );

1
include/eda_item.h
View File

@ -140,6 +140,7 @@ public:
void SetStatus( EDA_ITEM_FLAGS aStatus ) { m_status = aStatus; }
void SetFlags( EDA_ITEM_FLAGS aMask ) { m_flags |= aMask; }
void XorFlags( EDA_ITEM_FLAGS aMask ) { m_flags ^= aMask; }
void ClearFlags( EDA_ITEM_FLAGS aMask = EDA_ITEM_ALL_FLAGS ) { m_flags &= ~aMask; }
EDA_ITEM_FLAGS GetFlags() const { return m_flags; }
bool HasFlag( EDA_ITEM_FLAGS aFlag ) const { return ( m_flags & aFlag ) == aFlag; }