From d7550fe1c173f1be296f1ce7991ad6d70ed90ceb Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 8 Aug 2017 19:40:23 -0300 Subject: Settings form implementation start --- Project/PropertiesForm.h | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 Project/PropertiesForm.h (limited to 'Project/PropertiesForm.h') diff --git a/Project/PropertiesForm.h b/Project/PropertiesForm.h new file mode 100644 index 0000000..f0b325b --- /dev/null +++ b/Project/PropertiesForm.h @@ -0,0 +1,75 @@ +////////////////////////////////////////////////////////////////////// +// This file was auto-generated by codelite's wxCrafter Plugin +// wxCrafter project file: PropertiesForm.wxcp +// Do not modify this file by hand! +////////////////////////////////////////////////////////////////////// + +#ifndef _PSP_PROJECT_PROPERTIESFORM_BASE_CLASSES_H +#define _PSP_PROJECT_PROPERTIESFORM_BASE_CLASSES_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#if wxVERSION_NUMBER >= 2900 +#include +#include +#include +#include +#endif + +#ifdef WXC_FROM_DIP +#undef WXC_FROM_DIP +#endif +#if wxVERSION_NUMBER >= 3100 +#define WXC_FROM_DIP(x) wxWindow::FromDIP(x, NULL) +#else +#define WXC_FROM_DIP(x) x +#endif + + +class GeneralPropertiesFormBase : public wxDialog +{ +protected: + wxNotebook* m_notebook; + wxButton* m_buttonOK; + wxButton* m_buttonCancel; + +protected: + virtual void OnButtonOKClick(wxCommandEvent& event) { event.Skip(); } + virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } + +public: + wxNotebook* GetNotebook() { return m_notebook; } + wxButton* GetButtonOK() { return m_buttonOK; } + wxButton* GetButtonCancel() { return m_buttonCancel; } + GeneralPropertiesFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("General settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE); + virtual ~GeneralPropertiesFormBase(); +}; + + +class SimulationsSettingsFormBase : public wxDialog +{ +protected: + wxNotebook* m_notebook; + wxButton* m_buttonOK; + wxButton* m_buttonCancel; + +protected: + virtual void OnButtonOKClick(wxCommandEvent& event) { event.Skip(); } + virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } + +public: + wxNotebook* GetNotebook() { return m_notebook; } + wxButton* GetButtonOK() { return m_buttonOK; } + wxButton* GetButtonCancel() { return m_buttonCancel; } + SimulationsSettingsFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Simulation settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE); + virtual ~SimulationsSettingsFormBase(); +}; + +#endif -- cgit From 8a1ffbc01135a1466ad7400518e4c56a4bdc3af5 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 9 Aug 2017 21:01:41 -0300 Subject: Stability properties implemented --- Project/PropertiesForm.h | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) (limited to 'Project/PropertiesForm.h') diff --git a/Project/PropertiesForm.h b/Project/PropertiesForm.h index f0b325b..0998602 100644 --- a/Project/PropertiesForm.h +++ b/Project/PropertiesForm.h @@ -16,6 +16,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #if wxVERSION_NUMBER >= 2900 #include #include @@ -57,14 +65,83 @@ class SimulationsSettingsFormBase : public wxDialog { protected: wxNotebook* m_notebook; + wxPanel* m_panelGeneral; + wxStaticText* m_staticTextBasePower; + wxTextCtrl* m_textCtrlbasePower; + wxChoice* m_choiceBasePower; + wxCheckBox* m_checkBoxFaultAfterPF; + wxCheckBox* m_checkBoxSCPowerAfterPF; + wxPanel* m_panelPF; + wxStaticText* m_staticTextPFMethod; + wxChoice* m_choicePFMethod; + wxStaticText* m_staticTextAccFactor; + wxTextCtrl* m_textCtrlAccFactor; + wxStaticText* m_staticTextPFTolerance; + wxTextCtrl* m_textCtrlPFTolerance; + wxStaticText* m_staticTextPFMaxIterations; + wxTextCtrl* m_textCtrlPFMaxIterations; + wxPanel* m_panelStability; + wxStaticText* m_staticTextTimeStep; + wxTextCtrl* m_textCtrlTimeStep; + wxStaticText* m_staticTextSec_1; + wxStaticText* m_staticTextTSimTime; + wxTextCtrl* m_textCtrlSimTime; + wxStaticText* m_staticTextSec_2; + wxStaticText* m_staticTextFreq; + wxTextCtrl* m_textCtrlFreq; + wxStaticText* m_staticTextFreqUnit; + wxStaticText* m_staticTextTStabTolerance; + wxTextCtrl* m_textCtrlStabTolerance; + wxStaticText* m_staticTextTStabMaxIterations; + wxTextCtrl* m_textCtrlStabMaxIterations; + wxStaticText* m_staticTextCtrlStepRation; + wxTextCtrl* m_textCtrlCtrlStepRatio; + wxStaticText* m_staticTextPrintTime; + wxTextCtrl* m_textCtrlPrintTime; + wxStaticText* m_staticTextSec_4; wxButton* m_buttonOK; wxButton* m_buttonCancel; protected: + virtual void OnPFMethodChoiceSelected(wxCommandEvent& event) { event.Skip(); } virtual void OnButtonOKClick(wxCommandEvent& event) { event.Skip(); } virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } public: + wxStaticText* GetStaticTextBasePower() { return m_staticTextBasePower; } + wxTextCtrl* GetTextCtrlbasePower() { return m_textCtrlbasePower; } + wxChoice* GetChoiceBasePower() { return m_choiceBasePower; } + wxCheckBox* GetCheckBoxFaultAfterPF() { return m_checkBoxFaultAfterPF; } + wxCheckBox* GetCheckBoxSCPowerAfterPF() { return m_checkBoxSCPowerAfterPF; } + wxPanel* GetPanelGeneral() { return m_panelGeneral; } + wxStaticText* GetStaticTextPFMethod() { return m_staticTextPFMethod; } + wxChoice* GetChoicePFMethod() { return m_choicePFMethod; } + wxStaticText* GetStaticTextAccFactor() { return m_staticTextAccFactor; } + wxTextCtrl* GetTextCtrlAccFactor() { return m_textCtrlAccFactor; } + wxStaticText* GetStaticTextPFTolerance() { return m_staticTextPFTolerance; } + wxTextCtrl* GetTextCtrlPFTolerance() { return m_textCtrlPFTolerance; } + wxStaticText* GetStaticTextPFMaxIterations() { return m_staticTextPFMaxIterations; } + wxTextCtrl* GetTextCtrlPFMaxIterations() { return m_textCtrlPFMaxIterations; } + wxPanel* GetPanelPF() { return m_panelPF; } + wxStaticText* GetStaticTextTimeStep() { return m_staticTextTimeStep; } + wxTextCtrl* GetTextCtrlTimeStep() { return m_textCtrlTimeStep; } + wxStaticText* GetStaticTextSec_1() { return m_staticTextSec_1; } + wxStaticText* GetStaticTextTSimTime() { return m_staticTextTSimTime; } + wxTextCtrl* GetTextCtrlSimTime() { return m_textCtrlSimTime; } + wxStaticText* GetStaticTextSec_2() { return m_staticTextSec_2; } + wxStaticText* GetStaticTextFreq() { return m_staticTextFreq; } + wxTextCtrl* GetTextCtrlFreq() { return m_textCtrlFreq; } + wxStaticText* GetStaticTextFreqUnit() { return m_staticTextFreqUnit; } + wxStaticText* GetStaticTextTStabTolerance() { return m_staticTextTStabTolerance; } + wxTextCtrl* GetTextCtrlStabTolerance() { return m_textCtrlStabTolerance; } + wxStaticText* GetStaticTextTStabMaxIterations() { return m_staticTextTStabMaxIterations; } + wxTextCtrl* GetTextCtrlStabMaxIterations() { return m_textCtrlStabMaxIterations; } + wxStaticText* GetStaticTextCtrlStepRation() { return m_staticTextCtrlStepRation; } + wxTextCtrl* GetTextCtrlCtrlStepRatio() { return m_textCtrlCtrlStepRatio; } + wxStaticText* GetStaticTextPrintTime() { return m_staticTextPrintTime; } + wxTextCtrl* GetTextCtrlPrintTime() { return m_textCtrlPrintTime; } + wxStaticText* GetStaticTextSec_4() { return m_staticTextSec_4; } + wxPanel* GetPanelStability() { return m_panelStability; } wxNotebook* GetNotebook() { return m_notebook; } wxButton* GetButtonOK() { return m_buttonOK; } wxButton* GetButtonCancel() { return m_buttonCancel; } -- cgit From e5f19af9a5829a307951785e850e53fc4fcfac90 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 10 Aug 2017 18:07:02 -0300 Subject: Model 1 machine fixed, init file under implementation --- Project/PropertiesForm.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'Project/PropertiesForm.h') diff --git a/Project/PropertiesForm.h b/Project/PropertiesForm.h index 0998602..cc4b7e6 100644 --- a/Project/PropertiesForm.h +++ b/Project/PropertiesForm.h @@ -15,13 +15,13 @@ #include #include #include -#include #include #include #include -#include #include #include +#include +#include #include #include #if wxVERSION_NUMBER >= 2900 @@ -45,6 +45,11 @@ class GeneralPropertiesFormBase : public wxDialog { protected: wxNotebook* m_notebook; + wxPanel* m_panelGeneral; + wxStaticText* m_staticTextLanguage; + wxChoice* m_choiceLanguage; + wxStaticText* m_staticTextTheme; + wxChoice* m_choiceTheme; wxButton* m_buttonOK; wxButton* m_buttonCancel; @@ -53,6 +58,11 @@ protected: virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } public: + wxStaticText* GetStaticTextLanguage() { return m_staticTextLanguage; } + wxChoice* GetChoiceLanguage() { return m_choiceLanguage; } + wxStaticText* GetStaticTextTheme() { return m_staticTextTheme; } + wxChoice* GetChoiceTheme() { return m_choiceTheme; } + wxPanel* GetPanelGeneral() { return m_panelGeneral; } wxNotebook* GetNotebook() { return m_notebook; } wxButton* GetButtonOK() { return m_buttonOK; } wxButton* GetButtonCancel() { return m_buttonCancel; } -- cgit From 516cdb72d3ff99a1ee786d3ea24c9b579272fe76 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 30 Aug 2017 20:42:27 -0300 Subject: COI (center of inertia) implemented See Milano's book p. 342 --- Project/PropertiesForm.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Project/PropertiesForm.h') diff --git a/Project/PropertiesForm.h b/Project/PropertiesForm.h index cc4b7e6..c3704fb 100644 --- a/Project/PropertiesForm.h +++ b/Project/PropertiesForm.h @@ -109,6 +109,7 @@ protected: wxStaticText* m_staticTextPrintTime; wxTextCtrl* m_textCtrlPrintTime; wxStaticText* m_staticTextSec_4; + wxCheckBox* m_checkBoxUseCOI; wxButton* m_buttonOK; wxButton* m_buttonCancel; @@ -151,6 +152,7 @@ public: wxStaticText* GetStaticTextPrintTime() { return m_staticTextPrintTime; } wxTextCtrl* GetTextCtrlPrintTime() { return m_textCtrlPrintTime; } wxStaticText* GetStaticTextSec_4() { return m_staticTextSec_4; } + wxCheckBox* GetCheckBoxUseCOI() { return m_checkBoxUseCOI; } wxPanel* GetPanelStability() { return m_panelStability; } wxNotebook* GetNotebook() { return m_notebook; } wxButton* GetButtonOK() { return m_buttonOK; } -- cgit