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

pcbnew: Allow clearing local ratsnest 

The local ratsnest needs to be able to hide as well as show visibility.
Clicking a module will toggle the visibility while clicking off all
modules clears the local ratsnest display.

Fixes: lp:1531332
* https://bugs.launchpad.net/kicad/+bug/1531332
This commit is contained in:
Seth Hillbrand 2018-06-18 22:14:21 -07:00
parent 6990824597
commit 147c1e6088
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/ratsnest.cpp
View File

@ -257,9 +257,21 @@ void PCB_EDIT_FRAME::Show_1_Ratsnest( EDA_ITEM* item, wxDC* DC )
for( auto pad : mod->Pads() )
{
pad->SetLocalRatsnestVisible( true );
pad->SetLocalRatsnestVisible( !pad->GetLocalRatsnestVisible() );
}
m_canvas->Refresh();
}
else
{
auto modules = GetBoard()->Modules();
for( auto mod : modules )
{
for( auto pad : mod->Pads() )
{
pad->SetLocalRatsnestVisible( false );
}
}
}
m_canvas->Refresh();
}

22
pcbnew/tools/pcb_editor_control.cpp
View File

@ -1052,9 +1052,10 @@ int PCB_EDITOR_CONTROL::HighlightNetCursor( const TOOL_EVENT& aEvent )
}
static bool showLocalRatsnest( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition )
static bool showLocalRatsnest( TOOL_MANAGER* aToolMgr, BOARD* aBoard, const VECTOR2D& aPosition )
{
auto selectionTool = aToolMgr->GetTool<SELECTION_TOOL>();
auto modules = aBoard->Modules();
aToolMgr->RunAction( PCB_ACTIONS::selectionClear, true );
aToolMgr->RunAction( PCB_ACTIONS::selectionCursor, true, EDIT_TOOL::FootprintFilter );
@ -1062,7 +1063,18 @@ static bool showLocalRatsnest( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition
const SELECTION& selection = selectionTool->GetSelection();
if( selection.Empty() )
{
// Clear the previous local ratsnest if we click off all items
for( auto mod : modules )
{
for( auto pad : mod->Pads() )
{
pad->SetLocalRatsnestVisible( false );
}
}
return true;
}
for( auto item : selection )
{
@ -1070,7 +1082,7 @@ static bool showLocalRatsnest( TOOL_MANAGER* aToolMgr, const VECTOR2D& aPosition
{
for( auto pad : static_cast<MODULE *> (item)->Pads() )
{
pad->SetLocalRatsnestVisible( true );
pad->SetLocalRatsnestVisible( !pad->GetLocalRatsnestVisible() );
}
}
}
@ -1084,10 +1096,12 @@ int PCB_EDITOR_CONTROL::ShowLocalRatsnest( const TOOL_EVENT& aEvent )
Activate();
auto picker = m_toolMgr->GetTool<PICKER_TOOL>();
assert( picker );
auto board = getModel<BOARD>();
wxASSERT( picker );
wxASSERT( board );
m_frame->SetToolID( ID_PCB_SHOW_1_RATSNEST_BUTT, wxCURSOR_PENCIL, _( "Pick Components for Local Ratsnest" ) );
picker->SetClickHandler( std::bind( showLocalRatsnest, m_toolMgr, _1 ) );
picker->SetClickHandler( std::bind( showLocalRatsnest, m_toolMgr, board, _1 ) );
picker->SetSnapping( false );
picker->Activate();
Wait();