Merge pull request #33 from Thales1330/wip/electromechanical-calc

Wip electromechanical calc

1 files changed, 20 insertions, 1 deletions

diff --git a/Project/ControlElementSolver.cpp b/Project/ControlElementSolver.cpp
index e67cb9a..7c58512 100644
--- a/Project/ControlElementSolver.cpp
+++ b/Project/ControlElementSolver.cpp
@@ -21,7 +21,26 @@ ControlElementSolver::ControlElementSolver(ControlEditor* controlEditor,
 {
     m_ctrlContainer = new ControlElementContainer();
     m_ctrlContainer->FillContainer(controlEditor);
+    Initialize(controlEditor, timeStep, integrationError, startAllZero, input);
+}
+
+ControlElementSolver::ControlElementSolver(ControlElementContainer* ctrlContainer,
+                                           double timeStep,
+                                           double integrationError,
+                                           bool startAllZero,
+                                           double input,
+                                           wxWindow* parent)
+{
+    m_ctrlContainer = ctrlContainer;
+    Initialize(parent, timeStep, integrationError, startAllZero, input);
+}
 
+void ControlElementSolver::Initialize(wxWindow* parent,
+                                      double timeStep,
+                                      double integrationError,
+                                      bool startAllZero,
+                                      double input)
+{
     // Check if the sistem have one input and one output
     bool fail = false;
     wxString failMessage = "";
@@ -67,7 +86,7 @@ ControlElementSolver::ControlElementSolver(ControlEditor* controlEditor,
     }
 
     if(fail) {
-        wxMessageDialog msgDialog(controlEditor, failMessage, _("Error"), wxOK | wxCENTRE | wxICON_ERROR);
+        wxMessageDialog msgDialog(parent, failMessage, _("Error"), wxOK | wxCENTRE | wxICON_ERROR);
         msgDialog.ShowModal();
     } else {
         m_isOK = true;