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

Wip/induction motor

1 files changed, 25 insertions, 0 deletions

diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp
index 5afff94..5e81c89 100644
--- a/Project/MainFrame.cpp
+++ b/Project/MainFrame.cpp
@@ -22,6 +22,7 @@
 #include "DataReport.h"
 #include "FileHanding.h"
 #include "GeneralPropertiesForm.h"
+#include "HarmCurrent.h"
 #include "ImportForm.h"
 #include "IndMotor.h"
 #include "Inductor.h"
@@ -124,6 +125,8 @@ void MainFrame::EnableCurrentProjectRibbon(bool enable)
     m_ribbonButtonBarClipboard->EnableButton(ID_RIBBON_UNDO, enable);
     m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_ROTATEC, enable);
     m_ribbonButtonBarCircuit->EnableButton(ID_RIBBON_ROTATECC, enable);
+    m_ribbonButtonBarSimulations->EnableButton(ID_RIBBON_HARMDIST, enable);
+    m_ribbonButtonBarSimulations->EnableButton(ID_RIBBON_FREQRESP, enable);
 }
 
 void MainFrame::CreateAddElementsMenu()
@@ -150,6 +153,9 @@ void MainFrame::CreateAddElementsMenu()
                                                   _("Adds a shunt capacitor at the circuit"));
     wxMenuItem* inductorElement = new wxMenuItem(m_addElementsMenu, ID_ADDMENU_INDUCTOR, _("&Inductor\tShift-I"),
                                                  _("Adds a shunt inductor at the circuit"));
+    wxMenuItem* harmCurrentElement =
+        new wxMenuItem(m_addElementsMenu, ID_ADDMENU_HARMCURRENT, _("&Harmonic current\tShift-H"),
+                       _("Adds a harmonic current source at the circuit"));
 
     m_addElementsMenu->Append(busElement);
     m_addElementsMenu->Append(lineElement);
@@ -160,6 +166,7 @@ void MainFrame::CreateAddElementsMenu()
     m_addElementsMenu->Append(loadElement);
     m_addElementsMenu->Append(capacitorElement);
     m_addElementsMenu->Append(inductorElement);
+    m_addElementsMenu->Append(harmCurrentElement);
 
     m_addElementsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, &MainFrame::OnAddElementsClick, this);
 }
@@ -439,6 +446,14 @@ void MainFrame::OnAddElementsClick(wxCommandEvent& event)
                     statusBarText = _("Insert Inductor: Click on a buses, ESC to cancel.");
                     newElement = true;
                 } break;
+                case ID_ADDMENU_HARMCURRENT: {
+                    HarmCurrent* newHarmCurrent = new HarmCurrent(
+                        wxString::Format(_("Harmonic Current %d"), workspace->GetElementNumber(ID_INDUCTOR)));
+                    workspace->IncrementElementNumber(ID_HARMCURRENT);
+                    elementList.push_back(newHarmCurrent);
+                    statusBarText = _("Insert Harmonic Current Source: Click on a buses, ESC to cancel.");
+                    newElement = true;
+                } break;
                 case ID_ADDMENU_INDMOTOR: {
                     IndMotor* newIndMotor = new IndMotor(
                         wxString::Format(_("Induction motor %d"), workspace->GetElementNumber(ID_INDMOTOR)));
@@ -540,3 +555,13 @@ void MainFrame::OnSimulationSettingsClick(wxRibbonButtonBarEvent& event)
         simulSettingsForm.ShowModal();
     }
 }
+void MainFrame::OnFreqResponseClick(wxRibbonButtonBarEvent& event)
+{
+    Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage());
+    if(workspace) { workspace->RunFrequencyResponse(); }
+}
+void MainFrame::OnHarmDistortionsClick(wxRibbonButtonBarEvent& event)
+{
+    Workspace* workspace = static_cast<Workspace*>(m_auiNotebook->GetCurrentPage());
+    if(workspace) { workspace->RunHarmonicDistortion(); }
+}