From c6c3ff70bfceac839af471c11fc8aa04060517b0 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 15 May 2017 21:50:48 -0300 Subject: Control test and sync generator control implemented Text buggy when opens --- Project/ControlElementSolver.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'Project/ControlElementSolver.cpp') diff --git a/Project/ControlElementSolver.cpp b/Project/ControlElementSolver.cpp index e67cb9a..55cb313 100644 --- a/Project/ControlElementSolver.cpp +++ b/Project/ControlElementSolver.cpp @@ -21,7 +21,22 @@ 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 +82,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; -- cgit From 54291220edb747c2a059ac5d316f6f7b14445404 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 2 Jun 2017 20:08:33 -0300 Subject: Insert capacitor/inductor fixed --- Project/ControlElementSolver.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Project/ControlElementSolver.cpp') diff --git a/Project/ControlElementSolver.cpp b/Project/ControlElementSolver.cpp index 55cb313..7c58512 100644 --- a/Project/ControlElementSolver.cpp +++ b/Project/ControlElementSolver.cpp @@ -35,7 +35,11 @@ ControlElementSolver::ControlElementSolver(ControlElementContainer* ctrlContaine Initialize(parent, timeStep, integrationError, startAllZero, input); } -void ControlElementSolver::Initialize(wxWindow* parent, double timeStep, double integrationError, bool startAllZero, double 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; -- cgit