From a40d5a405d60b4e429f6f578dcfe3c33ab5ad81a Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 26 Apr 2019 02:29:47 -0300 Subject: Frequency response implemented Need a form --- Project/PropertiesFormBase.h | 104 +++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 43 deletions(-) (limited to 'Project/PropertiesFormBase.h') diff --git a/Project/PropertiesFormBase.h b/Project/PropertiesFormBase.h index f0a579b..d7d4dce 100644 --- a/Project/PropertiesFormBase.h +++ b/Project/PropertiesFormBase.h @@ -7,32 +7,32 @@ #ifndef _PSP_PROJECT_PROPERTIESFORM_BASE_CLASSES_H #define _PSP_PROJECT_PROPERTIESFORM_BASE_CLASSES_H -#include -#include -#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include -#include -#include +#include #include #include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include #if wxVERSION_NUMBER >= 2900 #include -#include #include +#include #include #endif @@ -45,10 +45,9 @@ #define WXC_FROM_DIP(x) x #endif - class GeneralPropertiesFormBase : public wxDialog { -protected: + protected: wxNotebook* m_notebook; wxPanel* m_panelGeneral; wxStaticText* m_staticTextLanguage; @@ -58,11 +57,11 @@ protected: wxButton* m_buttonOK; wxButton* m_buttonCancel; -protected: + protected: virtual void OnButtonOKClick(wxCommandEvent& event) { event.Skip(); } virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } -public: + public: wxStaticText* GetStaticTextLanguage() { return m_staticTextLanguage; } wxChoice* GetChoiceLanguage() { return m_choiceLanguage; } wxStaticText* GetStaticTextTheme() { return m_staticTextTheme; } @@ -71,21 +70,29 @@ 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); + 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: + protected: wxNotebook* m_notebook; wxPanel* m_panelGeneral; wxStaticText* m_staticTextBasePower; wxTextCtrl* m_textCtrlbasePower; wxChoice* m_choiceBasePower; + wxStaticText* m_staticTextFreq; + wxTextCtrl* m_textCtrlFreq; + wxStaticText* m_staticTextFreqUnit; wxCheckBox* m_checkBoxFaultAfterPF; wxCheckBox* m_checkBoxSCPowerAfterPF; + wxCheckBox* m_checkBoxTHDAfterPF; wxPanel* m_panelPF; wxStaticText* m_staticTextPFMethod; wxChoice* m_choicePFMethod; @@ -105,9 +112,6 @@ protected: 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; @@ -148,18 +152,22 @@ protected: wxButton* m_buttonOK; wxButton* m_buttonCancel; -protected: + protected: virtual void OnPFMethodChoiceSelected(wxCommandEvent& event) { event.Skip(); } virtual void OnCheckboxUseCompLoadClick(wxCommandEvent& event) { event.Skip(); } virtual void OnButtonOKClick(wxCommandEvent& event) { event.Skip(); } virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } -public: + public: wxStaticText* GetStaticTextBasePower() { return m_staticTextBasePower; } wxTextCtrl* GetTextCtrlbasePower() { return m_textCtrlbasePower; } wxChoice* GetChoiceBasePower() { return m_choiceBasePower; } + wxStaticText* GetStaticTextFreq() { return m_staticTextFreq; } + wxTextCtrl* GetTextCtrlFreq() { return m_textCtrlFreq; } + wxStaticText* GetStaticTextFreqUnit() { return m_staticTextFreqUnit; } wxCheckBox* GetCheckBoxFaultAfterPF() { return m_checkBoxFaultAfterPF; } wxCheckBox* GetCheckBoxSCPowerAfterPF() { return m_checkBoxSCPowerAfterPF; } + wxCheckBox* GetCheckBoxTHDAfterPF() { return m_checkBoxTHDAfterPF; } wxPanel* GetPanelGeneral() { return m_panelGeneral; } wxStaticText* GetStaticTextPFMethod() { return m_staticTextPFMethod; } wxChoice* GetChoicePFMethod() { return m_choicePFMethod; } @@ -179,9 +187,6 @@ public: 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; } @@ -223,14 +228,18 @@ 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); + 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(); }; - class AboutFormBase : public wxDialog { -protected: + protected: wxNotebook* m_notebook; wxPanel* m_panelLogo; wxStaticBitmap* m_staticBitmapLogo; @@ -244,10 +253,10 @@ protected: wxHyperlinkCtrl* m_hyperLinkPSP; wxButton* m_buttonOK; -protected: + protected: virtual void OnOKButtonClick(wxCommandEvent& event) { event.Skip(); } -public: + public: wxStaticBitmap* GetStaticBitmapLogo() { return m_staticBitmapLogo; } wxPanel* GetPanelLogo() { return m_panelLogo; } wxGrid* GetGridCredits() { return m_gridCredits; } @@ -260,14 +269,18 @@ public: wxStaticText* GetStaticTextHome() { return m_staticTextHome; } wxHyperlinkCtrl* GetHyperLinkPSP() { return m_hyperLinkPSP; } wxButton* GetButtonOK() { return m_buttonOK; } - AboutFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About PSP-UFU"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE); + AboutFormBase(wxWindow* parent, + wxWindowID id = wxID_ANY, + const wxString& title = _("About PSP-UFU"), + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxSize(-1, -1), + long style = wxDEFAULT_DIALOG_STYLE); virtual ~AboutFormBase(); }; - class ImportFormBase : public wxDialog { -protected: + protected: wxNotebook* m_notebook; wxPanel* m_panelCEPEL; wxStaticText* m_staticTextBasePWFFile; @@ -286,11 +299,11 @@ protected: wxButton* m_buttonOK; wxButton* m_buttonCancel; -protected: + protected: virtual void OnButtonOKClick(wxCommandEvent& event) { event.Skip(); } virtual void OnButtonCancelClick(wxCommandEvent& event) { event.Skip(); } -public: + public: wxStaticText* GetStaticTextBasePWFFile() { return m_staticTextBasePWFFile; } wxFilePickerCtrl* GetFilePickerANAREDEPWF() { return m_filePickerANAREDEPWF; } wxStaticText* GetStaticTextBaseLSTFile() { return m_staticTextBaseLSTFile; } @@ -308,7 +321,12 @@ public: wxNotebook* GetNotebook() { return m_notebook; } wxButton* GetButtonOK() { return m_buttonOK; } wxButton* GetButtonCancel() { return m_buttonCancel; } - ImportFormBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import files"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE); + ImportFormBase(wxWindow* parent, + wxWindowID id = wxID_ANY, + const wxString& title = _("Import files"), + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxSize(-1, -1), + long style = wxDEFAULT_DIALOG_STYLE); virtual ~ImportFormBase(); }; -- cgit