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

Improve drop-a-knee-selection-to-a-single-segment algorithm. 

In particular, don't rely on there being only two items in the
collector at the start.

Fixes https://gitlab.com/kicad/code/kicad/issues/10745

(cherry picked from commit a619ef9d53)
This commit is contained in:
Jeff Young 2022-09-08 13:09:05 +01:00
parent 2d4bcc6557
commit 2faaa0a042
1 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pcbnew/tools/edit_tool.cpp
View File

@ -290,20 +290,46 @@ int EDIT_TOOL::Drag( const TOOL_EVENT& aEvent )
sTool->FilterCollectorForFreePads( aCollector ); sTool->FilterCollectorForFreePads( aCollector );
sTool->FilterCollectorForHierarchy( aCollector, true ); sTool->FilterCollectorForHierarchy( aCollector, true );
// drop a knee between two segments to a single segment // drop a knee between two segments to a single segment, or a via with two
if( aCollector.GetCount() == 2 && dynamic_cast<PCB_TRACK*>( aCollector[0] ) ) // segments attached to the via
static KICAD_T trackTypes[] = { PCB_VIA_T, PCB_TRACE_T, PCB_ARC_T, EOT };
std::vector<PCB_TRACK*> tracks;
std::vector<PCB_TRACK*> vias;
for( EDA_ITEM* item : aCollector )
{ {
static KICAD_T types[] = { PCB_VIA_T, PCB_TRACE_T, PCB_ARC_T, EOT }; if( item->IsType( trackTypes ) )
tracks.push_back( static_cast<PCB_TRACK*>( item ) );
else if( item->Type() == PCB_VIA_T )
vias.push_back( static_cast<PCB_TRACK*>( item ) );
}
PCB_TRACK* a = static_cast<PCB_TRACK*>( aCollector[0] ); if( tracks.size() == 2 )
PCB_TRACK* b = static_cast<PCB_TRACK*>( aCollector[1] ); {
const auto& c = aCollector[0]->GetBoard()->GetConnectivity(); const BOARD* board = tracks[0]->GetBoard();
std::shared_ptr<CONNECTIVITY_DATA> c = board->GetConnectivity();
std::vector<BOARD_CONNECTED_ITEM*> cItems;
int dist = a->GetWidth() / 2; if( vias.size() == 1 )
auto connectedItems = c->GetConnectedItemsAtAnchor( a, aPt, types, dist ); {
cItems = c->GetConnectedItemsAtAnchor( vias[0], aPt, trackTypes,
vias[0]->GetWidth() / 2 );
if( alg::contains( connectedItems, b ) ) if( alg::contains( cItems, tracks[0] )
aCollector.Remove( b ); && alg::contains( cItems, tracks[1] ) )
{
aCollector.Remove( tracks[0] );
aCollector.Remove( tracks[1] );
}
}
else if( vias.size() == 0 )
{
cItems = c->GetConnectedItemsAtAnchor( tracks[0], aPt, trackTypes,
tracks[0]->GetWidth() / 2 );
if( alg::contains( cItems, tracks[1] ) )
aCollector.Remove( tracks[1] );
}
} }
}, },
true /* prompt user regarding locked items */ ); true /* prompt user regarding locked items */ );