diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2019-07-24 00:02:49 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 00:02:49 -0300 |
| commit | 4f434e4a1cccce69e4b680e4734df52244d3a30b (patch) | |
| tree | 54886abf6d62d9341377d535e52b36016b602107 /Project/MainFrameBase.cpp | |
| parent | 8357c081eb75147bb8f94d8b6e367d88ea3898ed (diff) | |
| parent | 0ca6710a7e003952e1212c8e32ebb2e7c008d508 (diff) | |
| download | PSP.git-4f434e4a1cccce69e4b680e4734df52244d3a30b.tar.gz PSP.git-4f434e4a1cccce69e4b680e4734df52244d3a30b.tar.xz PSP.git-4f434e4a1cccce69e4b680e4734df52244d3a30b.zip | |
Merge pull request #51 from Thales1330/wip/induction-motor
Newton bug fixed
Diffstat (limited to 'Project/MainFrameBase.cpp')
| -rw-r--r-- | Project/MainFrameBase.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Project/MainFrameBase.cpp b/Project/MainFrameBase.cpp index 6795ca0..3e1da85 100644 --- a/Project/MainFrameBase.cpp +++ b/Project/MainFrameBase.cpp @@ -263,7 +263,7 @@ MainFrameBase::MainFrameBase(wxWindow* parent, m_ribbonButtonBarSimulations->AddButton(ID_RIBBON_RUNSTAB, _("Run Stability"), wxXmlResource::Get()->LoadBitmap(wxT("playStopped32")), - _("Run the stability calculations"), wxRIBBON_BUTTON_NORMAL); + _("Run the stability calculations"), wxRIBBON_BUTTON_HYBRID); m_ribbonButtonBarSimulations->AddButton(ID_RIBBON_FAULT, _("Fault"), wxXmlResource::Get()->LoadBitmap(wxT("fault32")), @@ -387,6 +387,9 @@ MainFrameBase::MainFrameBase(wxWindow* parent, m_ribbonButtonBarSimulations->Connect(ID_RIBBON_RUNSTAB, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnRunStabilityClick), NULL, this); + m_ribbonButtonBarSimulations->Connect(ID_RIBBON_RUNSTAB, wxEVT_COMMAND_RIBBONBUTTON_DROPDOWN_CLICKED, + wxRibbonButtonBarEventHandler(MainFrameBase::OnStabilityDropdown), NULL, + this); m_ribbonButtonBarSimulations->Connect(ID_RIBBON_FAULT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnFaultClick), NULL, this); m_ribbonButtonBarSimulations->Connect(ID_RIBBON_SCPOWER, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, @@ -474,6 +477,9 @@ MainFrameBase::~MainFrameBase() m_ribbonButtonBarSimulations->Disconnect(ID_RIBBON_RUNSTAB, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnRunStabilityClick), NULL, this); + m_ribbonButtonBarSimulations->Disconnect(ID_RIBBON_RUNSTAB, wxEVT_COMMAND_RIBBONBUTTON_DROPDOWN_CLICKED, + wxRibbonButtonBarEventHandler(MainFrameBase::OnStabilityDropdown), NULL, + this); m_ribbonButtonBarSimulations->Disconnect(ID_RIBBON_FAULT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnFaultClick), NULL, this); m_ribbonButtonBarSimulations->Disconnect(ID_RIBBON_SCPOWER, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, |