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

Add length tuner settings to toolbar context menu

This commit is contained in:
david-beinder 2021-05-11 17:22:42 +02:00 committed by Jon Evans
parent 34145d8170
commit 75f49ba1b6
5 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pcbnew/router/length_tuner_tool.cpp
View File

@ -50,13 +50,6 @@ static TOOL_ACTION ACT_EndTuning( "pcbnew.LengthTuner.EndTuning",
WXK_END, LEGACY_HK_NAME( "Stop laying the current track." ),
_( "End Track" ), _( "Stops laying the current meander." ) );
static TOOL_ACTION ACT_Settings( "pcbnew.LengthTuner.Settings",
AS_CONTEXT,
// Don't be tempted to remove "Modern Toolset only". It's in the legacy property name.
MD_CTRL + 'L', LEGACY_HK_NAME( "Length Tuning Settings (Modern Toolset only)" ),
_( "Length Tuning Settings..." ), _( "Sets the length tuning parameters for currently routed item." ),
BITMAPS::router_len_tuner_setup );
static TOOL_ACTION ACT_SpacingIncrease( "pcbnew.LengthTuner.SpacingIncrease",
AS_CONTEXT,
'1', LEGACY_HK_NAME( "Increase meander spacing by one step." ),
@ -88,6 +81,9 @@ static TOOL_ACTION ACT_AmplDecrease( "pcbnew.LengthTuner.AmplDecrease",
LENGTH_TUNER_TOOL::LENGTH_TUNER_TOOL() :
TOOL_BASE( "pcbnew.LengthTuner" )
{
// set the initial tune mode for the settings dialog,
// in case the dialog is opened before the tool is activated the first time
m_lastTuneMode = PNS::ROUTER_MODE::PNS_MODE_TUNE_SINGLE;
}
@ -104,15 +100,15 @@ bool LENGTH_TUNER_TOOL::Init()
menu.SetIcon( BITMAPS::router_len_tuner );
menu.DisplayTitle( true );
menu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACTIONS::cancelInteractive, SELECTION_CONDITIONS::ShowAlways );
menu.AddSeparator();
menu.AddItem( ACT_SpacingIncrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_SpacingDecrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_AmplIncrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_AmplDecrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_Settings, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_SpacingIncrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_SpacingDecrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_AmplIncrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( ACT_AmplDecrease, SELECTION_CONDITIONS::ShowAlways );
menu.AddItem( PCB_ACTIONS::lengthTunerSettingsDialog, SELECTION_CONDITIONS::ShowAlways );
return true;
}
@ -234,7 +230,7 @@ void LENGTH_TUNER_TOOL::performTuning()
m_router->Move( end, NULL );
updateStatusPopup( statusPopup );
}
else if( evt->IsAction( &ACT_Settings ) )
else if( evt->IsAction( &PCB_ACTIONS::lengthTunerSettingsDialog ) )
{
statusPopup.Hide();
TOOL_EVENT dummy;
@ -255,9 +251,12 @@ void LENGTH_TUNER_TOOL::performTuning()
void LENGTH_TUNER_TOOL::setTransitions()
{
Go( &LENGTH_TUNER_TOOL::MainLoop, PCB_ACTIONS::routerTuneSingleTrace.MakeEvent() );
Go( &LENGTH_TUNER_TOOL::MainLoop, PCB_ACTIONS::routerTuneDiffPair.MakeEvent() );
Go( &LENGTH_TUNER_TOOL::MainLoop, PCB_ACTIONS::routerTuneDiffPairSkew.MakeEvent() );
Go( &LENGTH_TUNER_TOOL::MainLoop, PCB_ACTIONS::routerTuneSingleTrace.MakeEvent() );
Go( &LENGTH_TUNER_TOOL::MainLoop, PCB_ACTIONS::routerTuneDiffPair.MakeEvent() );
Go( &LENGTH_TUNER_TOOL::MainLoop, PCB_ACTIONS::routerTuneDiffPairSkew.MakeEvent() );
// in case tool is inactive, otherwise the event is handled in the tool loop
Go( &LENGTH_TUNER_TOOL::meanderSettingsDialog, PCB_ACTIONS::lengthTunerSettingsDialog.MakeEvent() );
}
@ -270,7 +269,8 @@ int LENGTH_TUNER_TOOL::MainLoop( const TOOL_EVENT& aEvent )
frame()->PushTool( tool );
Activate();
m_router->SetMode( aEvent.Parameter<PNS::ROUTER_MODE>() );
m_lastTuneMode = aEvent.Parameter<PNS::ROUTER_MODE>();
m_router->SetMode( m_lastTuneMode );
controls()->ShowCursor( true );
@ -309,7 +309,7 @@ int LENGTH_TUNER_TOOL::MainLoop( const TOOL_EVENT& aEvent )
updateStartItem( *evt );
performTuning();
}
else if( evt->IsAction( &ACT_Settings ) )
else if( evt->IsAction( &PCB_ACTIONS::lengthTunerSettingsDialog ) )
{
TOOL_EVENT dummy;
meanderSettingsDialog( dummy );
@ -337,7 +337,7 @@ int LENGTH_TUNER_TOOL::meanderSettingsDialog( const TOOL_EVENT& aEvent )
PNS::MEANDER_PLACER_BASE* placer = static_cast<PNS::MEANDER_PLACER_BASE*>( m_router->Placer() );
PNS::MEANDER_SETTINGS settings = placer ? placer->MeanderSettings() : m_savedMeanderSettings;
DIALOG_PNS_LENGTH_TUNING_SETTINGS settingsDlg( frame(), settings, m_router->Mode() );
DIALOG_PNS_LENGTH_TUNING_SETTINGS settingsDlg( frame(), settings, m_lastTuneMode );
if( settingsDlg.ShowModal() == wxID_OK )
{

2
pcbnew/router/length_tuner_tool.h
View File

@ -47,10 +47,10 @@ private:
void performTuning();
void updateStatusPopup( PNS_TUNE_STATUS_POPUP& aPopup );
int routerOptionsDialog( const TOOL_EVENT& aEvent );
int meanderSettingsDialog( const TOOL_EVENT& aEvent );
PNS::MEANDER_SETTINGS m_savedMeanderSettings;
PNS::ROUTER_MODE m_lastTuneMode;
};
#endif

12
pcbnew/toolbars_pcb_editor.cpp
View File

@ -488,6 +488,18 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
m_drawToolBar->AddToolContextMenu( PCB_ACTIONS::routeSingleTrack, makeRouteMenu() );
m_drawToolBar->AddToolContextMenu( PCB_ACTIONS::routeDiffPair, makeRouteMenu() );
auto makeTuneMenu =
[&]()
{
std::unique_ptr<ACTION_MENU> tuneMenu = std::make_unique<ACTION_MENU>( false, selTool );
tuneMenu->Add( PCB_ACTIONS::lengthTunerSettingsDialog );
return tuneMenu;
};
m_drawToolBar->AddToolContextMenu( PCB_ACTIONS::routerTuneSingleTrace, makeTuneMenu() );
m_drawToolBar->AddToolContextMenu( PCB_ACTIONS::routerTuneDiffPair, makeTuneMenu() );
m_drawToolBar->AddToolContextMenu( PCB_ACTIONS::routerTuneDiffPairSkew, makeTuneMenu() );
std::unique_ptr<ACTION_MENU> zoneMenu = std::make_unique<ACTION_MENU>( false, selTool );
zoneMenu->Add( PCB_ACTIONS::zoneFillAll );
zoneMenu->Add( PCB_ACTIONS::zoneUnfillAll );

11
pcbnew/tools/pcb_actions.cpp
View File

@ -1352,3 +1352,14 @@ TOOL_ACTION PCB_ACTIONS::dragFreeAngle( "pcbnew.InteractiveRouter.DragFreeAngle"
_( "Drag (free angle)" ),
_( "Drags the nearest joint in the track without restricting the track angle." ),
BITMAPS::drag );
// LENGTH_TUNER_TOOL
//
TOOL_ACTION PCB_ACTIONS::lengthTunerSettingsDialog( "pcbnew.LengthTuner.Settings",
AS_CONTEXT,
// Don't be tempted to remove "Modern Toolset only". It's in the legacy property name.
MD_CTRL + 'L', LEGACY_HK_NAME( "Length Tuning Settings (Modern Toolset only)" ),
_( "Length Tuning Settings..." ),
_( "Sets the length tuning parameters for currently routed item." ),
BITMAPS::router_len_tuner_setup );

1
pcbnew/tools/pcb_actions.h
View File

@ -201,6 +201,7 @@ public:
/// Activation of the Push and Shove settings dialogs
static TOOL_ACTION routerSettingsDialog;
static TOOL_ACTION routerDiffPairDialog;
static TOOL_ACTION lengthTunerSettingsDialog;
/// Actions to enable switching modes via hotkey assignments
static TOOL_ACTION routerHighlightMode;