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

Make sure properties commands don't go to other tools during routing. 

Brings up the track widths (or diff pairs) context menu instead,
which seems to be the closest parallel.

Fixes https://gitlab.com/kicad/code/kicad/issues/7099
This commit is contained in:
Jeff Young 2021-01-14 15:17:24 +00:00
parent 3e920c665f
commit 02ccd5fbdb
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcbnew/router/router_tool.cpp
View File

@ -422,13 +422,13 @@ bool ROUTER_TOOL::Init()
auto& menu = m_menu.GetMenu();
menu.SetTitle( _( "Interactive Router" ) );
auto trackViaMenu = std::make_shared<TRACK_WIDTH_MENU>( *frame );
trackViaMenu->SetTool( this );
m_menu.AddSubMenu( trackViaMenu );
m_trackViaMenu = std::make_shared<TRACK_WIDTH_MENU>( *frame );
m_trackViaMenu->SetTool( this );
m_menu.AddSubMenu( m_trackViaMenu );
auto diffPairMenu = std::make_shared<DIFF_PAIR_MENU>( *frame );
diffPairMenu->SetTool( this );
m_menu.AddSubMenu( diffPairMenu );
m_diffPairMenu = std::make_shared<DIFF_PAIR_MENU>( *frame );
m_diffPairMenu->SetTool( this );
m_menu.AddSubMenu( m_diffPairMenu );
menu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways );
@ -460,8 +460,8 @@ bool ROUTER_TOOL::Init()
return m_router->Mode() == PNS::PNS_MODE_ROUTE_DIFF_PAIR;
};
menu.AddMenu( trackViaMenu.get(), SELECTION_CONDITIONS::ShowAlways );
menu.AddMenu( diffPairMenu.get(), diffPairCond );
menu.AddMenu( m_trackViaMenu.get(), SELECTION_CONDITIONS::ShowAlways );
menu.AddMenu( m_diffPairMenu.get(), diffPairCond );
menu.AddItem( PCB_ACTIONS::routerSettingsDialog, SELECTION_CONDITIONS::ShowAlways );
@ -1083,6 +1083,18 @@ void ROUTER_TOOL::performRouting()
updateEndItem( *evt );
m_router->Move( m_endSnapPoint, m_endItem ); // refresh
}
else if( evt->IsAction( &PCB_ACTIONS::properties ) )
{
ACTION_MENU* menu;
if( m_router->Mode() == PNS::PNS_MODE_ROUTE_DIFF_PAIR )
menu = m_diffPairMenu.get();
else
menu = m_trackViaMenu.get();
menu->SetDirty();
SetContextMenu( menu, CMENU_NOW );
}
else if( evt->IsAction( &ACT_EndTrack ) || evt->IsDblClick( BUT_LEFT ) )
{
// Stop current routing:

4
pcbnew/router/router_tool.h
View File

@ -71,6 +71,10 @@ private:
bool prepareInteractive();
bool finishInteractive();
private:
std::shared_ptr<ACTION_MENU> m_diffPairMenu;
std::shared_ptr<ACTION_MENU> m_trackViaMenu;
};
#endif