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/PropertiesFormBase.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/PropertiesFormBase.cpp')
| -rw-r--r-- | Project/PropertiesFormBase.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Project/PropertiesFormBase.cpp b/Project/PropertiesFormBase.cpp index a498e3b..c2fb1ad 100644 --- a/Project/PropertiesFormBase.cpp +++ b/Project/PropertiesFormBase.cpp @@ -260,6 +260,7 @@ SimulationsSettingsFormBase::SimulationsSettingsFormBase(wxWindow* parent, wxArrayString m_choicePFMethodArr; m_choicePFMethodArr.Add(wxT("Gauss-Seidel")); m_choicePFMethodArr.Add(wxT("Newton-Raphson")); + m_choicePFMethodArr.Add(wxT("Hybrid Gauss-Newton")); m_choicePFMethod = new wxChoice(m_panelPF, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_panelPF, wxSize(-1, -1)), m_choicePFMethodArr, 0); m_choicePFMethod->SetSelection(0); @@ -355,6 +356,26 @@ SimulationsSettingsFormBase::SimulationsSettingsFormBase(wxWindow* parent, boxSizerLvl5_17->Add(m_staticTextDeg_1, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + wxBoxSizer* boxSizerLvl4_21 = new wxBoxSizer(wxVERTICAL); + + gridSizerLvl_3_4->Add(boxSizerLvl4_21, 0, wxEXPAND, WXC_FROM_DIP(5)); + + m_staticTextPFGaussTolerance = new wxStaticText(m_panelPF, wxID_ANY, _("Gauss tolerance"), wxDefaultPosition, + wxDLG_UNIT(m_panelPF, wxSize(-1, -1)), 0); + + boxSizerLvl4_21->Add(m_staticTextPFGaussTolerance, 0, wxLEFT | wxRIGHT | wxTOP | wxALIGN_CENTER_VERTICAL, + WXC_FROM_DIP(5)); + + m_textCtrlPFGaussTolerance = + new wxTextCtrl(m_panelPF, wxID_ANY, wxT("1e-2"), wxDefaultPosition, wxDLG_UNIT(m_panelPF, wxSize(-1, -1)), 0); +#if wxVERSION_NUMBER >= 3000 + m_textCtrlPFGaussTolerance->SetHint(wxT("")); +#endif + + boxSizerLvl4_21->Add(m_textCtrlPFGaussTolerance, 0, + wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND | wxALIGN_CENTER_VERTICAL, WXC_FROM_DIP(5)); + m_textCtrlPFGaussTolerance->SetMinSize(wxSize(20, -1)); + m_panelStability = new wxPanel(m_notebook, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_notebook, wxSize(-1, -1)), wxTAB_TRAVERSAL); m_notebook->AddPage(m_panelStability, _("Stability"), false); |