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

Display options can change during the picker lifecycle 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/7133
This commit is contained in:
Jon Evans 2021-04-12 22:12:48 -04:00
parent 6129f978ab
commit 37dd4038eb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/tools/board_inspection_tool.cpp
View File

@ -956,15 +956,15 @@ int BOARD_INSPECTION_TOOL::LocalRatsnestTool( const TOOL_EVENT& aEvent )
std::string tool = aEvent.GetCommandStr().get(); std::string tool = aEvent.GetCommandStr().get();
PCB_PICKER_TOOL* picker = m_toolMgr->GetTool<PCB_PICKER_TOOL>(); PCB_PICKER_TOOL* picker = m_toolMgr->GetTool<PCB_PICKER_TOOL>();
BOARD* board = getModel<BOARD>(); BOARD* board = getModel<BOARD>();
auto& opt = displayOptions();
// Deactivate other tools; particularly important if another PICKER is currently running // Deactivate other tools; particularly important if another PICKER is currently running
Activate(); Activate();
picker->SetClickHandler( picker->SetClickHandler(
[this, board, opt]( const VECTOR2D& pt ) -> bool [this, board]( const VECTOR2D& pt ) -> bool
{ {
PCB_SELECTION_TOOL* selectionTool = m_toolMgr->GetTool<PCB_SELECTION_TOOL>(); const PCB_DISPLAY_OPTIONS& opt = displayOptions();
PCB_SELECTION_TOOL* selectionTool = m_toolMgr->GetTool<PCB_SELECTION_TOOL>();
m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
m_toolMgr->RunAction( PCB_ACTIONS::selectionCursor, true, EDIT_TOOL::PadFilter ); m_toolMgr->RunAction( PCB_ACTIONS::selectionCursor, true, EDIT_TOOL::PadFilter );
@ -1013,8 +1013,10 @@ int BOARD_INSPECTION_TOOL::LocalRatsnestTool( const TOOL_EVENT& aEvent )
} ); } );
picker->SetFinalizeHandler( picker->SetFinalizeHandler(
[board, opt] ( int aCondition ) [this, board]( int aCondition )
{ {
const PCB_DISPLAY_OPTIONS& opt = displayOptions();
if( aCondition != PCB_PICKER_TOOL::END_ACTIVATE ) if( aCondition != PCB_PICKER_TOOL::END_ACTIVATE )
{ {
for( FOOTPRINT* fp : board->Footprints() ) for( FOOTPRINT* fp : board->Footprints() )