realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add SELECTION_CANDIDATE flag to EDA_ITEM flags

Browse Source 
This is now used when marking selection candidates in the schematic
selection tool. This avoids using CANDIDATE, which can case issues
with connectivity updates if it is not cleared after use.
This commit is contained in:
JamesJCode 2025-04-29 18:32:59 +01:00
parent b4a14bf681
commit d550e34cf6
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
eeschema/tools/sch_selection_tool.cpp
View File

@ -2268,7 +2268,7 @@ bool SCH_SELECTION_TOOL::selectMultiple()
{
EDA_ITEM_FLAGS flags = 0;
item->SetFlags( CANDIDATE );
item->SetFlags( SELECTION_CANDIDATE );
flaggedItems.push_back( item );
if( m_frame->GetRenderSettings()->m_ShowPinsElectricalType )
@ -2304,9 +2304,7 @@ bool SCH_SELECTION_TOOL::selectMultiple()
if( m_frame->GetRenderSettings()->m_ShowPinsElectricalType )
item->SetFlags( SHOW_ELEC_TYPE );
if( Selectable( item )
&& itemPassesFilter( item )
&& !item->GetParent()->HasFlag( CANDIDATE )
if( Selectable( item ) && itemPassesFilter( item ) && !item->GetParent()->HasFlag( SELECTION_CANDIDATE )
&& item->HitTest( selectionRect, !isGreedy ) )
{
selectItem( item, 0 );
@ -2316,7 +2314,7 @@ bool SCH_SELECTION_TOOL::selectMultiple()
}
for( EDA_ITEM* item : flaggedItems )
item->ClearFlags( CANDIDATE );
item->ClearFlags( SELECTION_CANDIDATE );
m_selection.SetIsHover( false );
@ -2359,21 +2357,21 @@ void SCH_SELECTION_TOOL::filterCollectorForHierarchy( SCH_COLLECTOR& aCollector,
{
std::unordered_set<EDA_ITEM*> toAdd;
// Set CANDIDATE on all parents which are included in the GENERAL_COLLECTOR. This
// Set SELECTION_CANDIDATE on all parents which are included in the GENERAL_COLLECTOR. This
// algorithm is O(3n), whereas checking for the parent inclusion could potentially be O(n^2).
for( int j = 0; j < aCollector.GetCount(); j++ )
{
if( aCollector[j]->GetParent() )
aCollector[j]->GetParent()->ClearFlags( CANDIDATE );
aCollector[j]->GetParent()->ClearFlags( SELECTION_CANDIDATE );
if( aCollector[j]->GetParentSymbol() )
aCollector[j]->GetParentSymbol()->ClearFlags( CANDIDATE );
aCollector[j]->GetParentSymbol()->ClearFlags( SELECTION_CANDIDATE );
}
if( aMultiselect )
{
for( int j = 0; j < aCollector.GetCount(); j++ )
aCollector[j]->SetFlags( CANDIDATE );
aCollector[j]->SetFlags( SELECTION_CANDIDATE );
}
for( int j = 0; j < aCollector.GetCount(); )
@ -2399,7 +2397,7 @@ void SCH_SELECTION_TOOL::filterCollectorForHierarchy( SCH_COLLECTOR& aCollector,
if( top->AsEdaItem() != item )
{
toAdd.insert( top->AsEdaItem() );
top->AsEdaItem()->SetFlags( CANDIDATE );
top->AsEdaItem()->SetFlags( SELECTION_CANDIDATE );
aCollector.Remove( item );
continue;
@ -2407,7 +2405,7 @@ void SCH_SELECTION_TOOL::filterCollectorForHierarchy( SCH_COLLECTOR& aCollector,
}
// Symbols are a bit easier as they can't be nested.
if( sym && ( sym->GetFlags() & CANDIDATE ) )
if( sym && ( sym->GetFlags() & SELECTION_CANDIDATE ) )
{
// Remove children of selected items
aCollector.Remove( item );
@ -2439,9 +2437,9 @@ void SCH_SELECTION_TOOL::InitializeSelectionState( SCH_TABLE* aTable )
for( SCH_TABLECELL* cell : aTable->GetCells() )
{
if( cell->IsSelected() )
cell->SetFlags( CANDIDATE );
cell->SetFlags( SELECTION_CANDIDATE );
else
cell->ClearFlags( CANDIDATE );
cell->ClearFlags( SELECTION_CANDIDATE );
}
}
@ -2450,10 +2448,9 @@ void SCH_SELECTION_TOOL::SelectCellsBetween( const VECTOR2D& start, const VECTOR
BOX2I selectionRect( start, end );
selectionRect.Normalize();
auto wasSelected =
[]( EDA_ITEM* aItem )
auto wasSelected = []( EDA_ITEM* aItem )
{
return ( aItem->GetFlags() & CANDIDATE ) > 0;
return ( aItem->GetFlags() & SELECTION_CANDIDATE ) > 0;
};
for( SCH_TABLECELL* cell : aTable->GetCells() )
@ -2509,9 +2506,9 @@ bool SCH_SELECTION_TOOL::selectTableCells( SCH_TABLE* aTable )
for( SCH_TABLECELL* cell : aTable->GetCells() )
{
if( cell->IsSelected() && ( cell->GetFlags() & CANDIDATE ) <= 0 )
if( cell->IsSelected() && ( cell->GetFlags() & SELECTION_CANDIDATE ) <= 0 )
anyAdded = true;
else if( ( cell->GetFlags() & CANDIDATE ) > 0 && !cell->IsSelected() )
else if( ( cell->GetFlags() & SELECTION_CANDIDATE ) > 0 && !cell->IsSelected() )
anySubtracted = true;
}

2
include/eda_item.h
View File

@ -156,7 +156,7 @@ public:
EDA_ITEM_FLAGS GetTempFlags() const
{
constexpr int mask = ( CANDIDATE | SELECTED_BY_DRAG | IS_LINKED | SKIP_STRUCT );
constexpr int mask = ( CANDIDATE | SELECTED_BY_DRAG | IS_LINKED | SKIP_STRUCT | SELECTION_CANDIDATE );
return m_flags & mask;
}

1
include/eda_item_flags.h
View File

@ -72,6 +72,7 @@
#define IS_DANGLING (1 << 29) ///< indicates a pin is dangling
#define ENTERED (1 << 30) ///< indicates a group has been entered
#define SELECTION_CANDIDATE ( 1 << 31 ) ///< indicates an item is a candidate for selection
// WARNING: if you add flags, you'll probably need to adjust the masks in GetEditFlags() and
// ClearTempFlags().