Merge pull request #50 from Thales1330/wip/induction-motor

Wip/induction motor

1 files changed, 119 insertions, 43 deletions

diff --git a/Project/PropertiesFormBase.h b/Project/PropertiesFormBase.h
index f498e1e..a7c3872 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 <wx/settings.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/xrc/xh_bmp.h>
+#include <wx/arrstr.h>
+#include <wx/artprov.h>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/choice.h>
 #include <wx/dialog.h>
+#include <wx/filepicker.h>
+#include <wx/grid.h>
+#include <wx/hyperlink.h>
 #include <wx/iconbndl.h>
-#include <wx/artprov.h>
-#include <wx/sizer.h>
+#include <wx/imaglist.h>
 #include <wx/notebook.h>
 #include <wx/panel.h>
-#include <wx/imaglist.h>
+#include <wx/richtext/richtextctrl.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/statbox.h>
 #include <wx/stattext.h>
-#include <wx/choice.h>
-#include <wx/arrstr.h>
-#include <wx/button.h>
 #include <wx/textctrl.h>
-#include <wx/statbox.h>
-#include <wx/checkbox.h>
-#include <wx/statbmp.h>
-#include <wx/grid.h>
-#include <wx/richtext/richtextctrl.h>
-#include <wx/hyperlink.h>
-#include <wx/filepicker.h>
+#include <wx/xrc/xh_bmp.h>
+#include <wx/xrc/xmlres.h>
 #if wxVERSION_NUMBER >= 2900
 #include <wx/persist.h>
-#include <wx/persist/toplevel.h>
 #include <wx/persist/bookctrl.h>
+#include <wx/persist/toplevel.h>
 #include <wx/persist/treebook.h>
 #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;
@@ -276,14 +289,21 @@ protected:
     wxFilePickerCtrl* m_filePickerANAREDELST;
     wxStaticText* m_staticTextBaseSTBFile;
     wxFilePickerCtrl* m_filePickerANATEMSTB;
+    wxPanel* m_panelMatpower;
+    wxStaticText* m_staticTextBaseMFile;
+    wxFilePickerCtrl* m_filePickerMatpowerM;
+    wxStaticText* m_staticTextScale;
+    wxTextCtrl* m_textCtrlScale;
+    wxStaticText* m_staticTextIteration;
+    wxTextCtrl* m_textCtrlIterations;
     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; }
@@ -291,11 +311,67 @@ public:
     wxStaticText* GetStaticTextBaseSTBFile() { return m_staticTextBaseSTBFile; }
     wxFilePickerCtrl* GetFilePickerANATEMSTB() { return m_filePickerANATEMSTB; }
     wxPanel* GetPanelCEPEL() { return m_panelCEPEL; }
+    wxStaticText* GetStaticTextBaseMFile() { return m_staticTextBaseMFile; }
+    wxFilePickerCtrl* GetFilePickerMatpowerM() { return m_filePickerMatpowerM; }
+    wxStaticText* GetStaticTextScale() { return m_staticTextScale; }
+    wxTextCtrl* GetTextCtrlScale() { return m_textCtrlScale; }
+    wxStaticText* GetStaticTextIteration() { return m_staticTextIteration; }
+    wxTextCtrl* GetTextCtrlIterations() { return m_textCtrlIterations; }
+    wxPanel* GetPanelMatpower() { return m_panelMatpower; }
     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();
 };
 
+class FrequencyResponseFormBase : public wxDialog
+{
+   protected:
+    wxStaticText* m_staticTextInitFreq;
+    wxTextCtrl* m_textCtrlInitFreq;
+    wxStaticText* m_staticTextFreqUnit78;
+    wxStaticText* m_staticTextFinalFreq;
+    wxTextCtrl* m_textCtrlFinalFreq;
+    wxStaticText* m_staticTextFreqUnit2;
+    wxStaticText* m_staticTextStep;
+    wxTextCtrl* m_textCtrlStepFreq;
+    wxStaticText* m_staticTextFreqUnit3;
+    wxStaticText* m_staticTextInjCurrent;
+    wxChoice* m_choiceBus;
+    wxButton* m_buttonRun;
+    wxButton* m_buttonCancel;
+
+   protected:
+    virtual void OnRunButtonClick(wxCommandEvent& event) { event.Skip(); }
+    virtual void OnCancelButtonClick(wxCommandEvent& event) { event.Skip(); }
+
+   public:
+    wxStaticText* GetStaticTextInitFreq() { return m_staticTextInitFreq; }
+    wxTextCtrl* GetTextCtrlInitFreq() { return m_textCtrlInitFreq; }
+    wxStaticText* GetStaticTextFreqUnit78() { return m_staticTextFreqUnit78; }
+    wxStaticText* GetStaticTextFinalFreq() { return m_staticTextFinalFreq; }
+    wxTextCtrl* GetTextCtrlFinalFreq() { return m_textCtrlFinalFreq; }
+    wxStaticText* GetStaticTextFreqUnit2() { return m_staticTextFreqUnit2; }
+    wxStaticText* GetStaticTextStep() { return m_staticTextStep; }
+    wxTextCtrl* GetTextCtrlStepFreq() { return m_textCtrlStepFreq; }
+    wxStaticText* GetStaticTextFreqUnit3() { return m_staticTextFreqUnit3; }
+    wxStaticText* GetStaticTextInjCurrent() { return m_staticTextInjCurrent; }
+    wxChoice* GetChoiceBus() { return m_choiceBus; }
+    wxButton* GetButtonRun() { return m_buttonRun; }
+    wxButton* GetButtonCancel() { return m_buttonCancel; }
+    FrequencyResponseFormBase(wxWindow* parent,
+                              wxWindowID id = wxID_ANY,
+                              const wxString& title = _("Frequency response"),
+                              const wxPoint& pos = wxDefaultPosition,
+                              const wxSize& size = wxSize(-1, -1),
+                              long style = wxDEFAULT_DIALOG_STYLE);
+    virtual ~FrequencyResponseFormBase();
+};
+
 #endif