From ae9530685962e8d4d88c871ec7f5f896dd0b4a93 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 6 Oct 2017 22:23:09 -0300 Subject: Several new implementation, not working --- Project/IOControlForm.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'Project/IOControlForm.cpp') diff --git a/Project/IOControlForm.cpp b/Project/IOControlForm.cpp index 583e534..592c5be 100644 --- a/Project/IOControlForm.cpp +++ b/Project/IOControlForm.cpp @@ -59,6 +59,25 @@ IOControlForm::IOControlForm(wxWindow* parent, IOControl* ioControl) : IOControl if(m_ioControl->GetValue() == IOControl::OUT_MEC_POWER) outChoiceNumber = (int)m_outputFlags.size() - 1; } + if(ioFlags & IOControl::IN_INITIAL_MEC_POWER) { + m_choiceOutput->Append(_("Initial mechanical power")); + m_outputFlags.push_back(IOControl::IN_INITIAL_MEC_POWER); + if(m_ioControl->GetValue() == IOControl::IN_INITIAL_MEC_POWER) outChoiceNumber = (int)m_outputFlags.size() - 1; + } + + if(ioFlags & IOControl::IN_INITIAL_TERMINAL_VOLTAGE) { + m_choiceOutput->Append(_("Initial terminal voltage")); + m_outputFlags.push_back(IOControl::IN_INITIAL_TERMINAL_VOLTAGE); + if(m_ioControl->GetValue() == IOControl::IN_INITIAL_TERMINAL_VOLTAGE) + outChoiceNumber = (int)m_outputFlags.size() - 1; + } + + if(ioFlags & IOControl::IN_INITIAL_VELOCITY) { + m_choiceOutput->Append(_("Initial velocity")); + m_outputFlags.push_back(IOControl::IN_INITIAL_VELOCITY); + if(m_ioControl->GetValue() == IOControl::IN_INITIAL_VELOCITY) outChoiceNumber = (int)m_outputFlags.size() - 1; + } + if(inChoiceNumber != -1) { m_choiceInput->SetSelection(inChoiceNumber); m_checkBoxInput->SetValue(true); -- cgit From 2552edfb5608ae15600aac38622354fe46701002 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 7 Oct 2017 17:56:03 -0300 Subject: MIMO fully implemented Electromechanical adjusted Some control editor bugfixes --- Project/IOControlForm.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Project/IOControlForm.cpp') diff --git a/Project/IOControlForm.cpp b/Project/IOControlForm.cpp index 592c5be..bb049a1 100644 --- a/Project/IOControlForm.cpp +++ b/Project/IOControlForm.cpp @@ -60,22 +60,22 @@ IOControlForm::IOControlForm(wxWindow* parent, IOControl* ioControl) : IOControl } if(ioFlags & IOControl::IN_INITIAL_MEC_POWER) { - m_choiceOutput->Append(_("Initial mechanical power")); - m_outputFlags.push_back(IOControl::IN_INITIAL_MEC_POWER); - if(m_ioControl->GetValue() == IOControl::IN_INITIAL_MEC_POWER) outChoiceNumber = (int)m_outputFlags.size() - 1; + m_choiceInput->Append(_("Initial mechanical power")); + m_inputFlags.push_back(IOControl::IN_INITIAL_MEC_POWER); + if(m_ioControl->GetValue() == IOControl::IN_INITIAL_MEC_POWER) inChoiceNumber = (int)m_inputFlags.size() - 1; } if(ioFlags & IOControl::IN_INITIAL_TERMINAL_VOLTAGE) { - m_choiceOutput->Append(_("Initial terminal voltage")); - m_outputFlags.push_back(IOControl::IN_INITIAL_TERMINAL_VOLTAGE); + m_choiceInput->Append(_("Initial terminal voltage")); + m_inputFlags.push_back(IOControl::IN_INITIAL_TERMINAL_VOLTAGE); if(m_ioControl->GetValue() == IOControl::IN_INITIAL_TERMINAL_VOLTAGE) - outChoiceNumber = (int)m_outputFlags.size() - 1; + inChoiceNumber = (int)m_inputFlags.size() - 1; } if(ioFlags & IOControl::IN_INITIAL_VELOCITY) { - m_choiceOutput->Append(_("Initial velocity")); - m_outputFlags.push_back(IOControl::IN_INITIAL_VELOCITY); - if(m_ioControl->GetValue() == IOControl::IN_INITIAL_VELOCITY) outChoiceNumber = (int)m_outputFlags.size() - 1; + m_choiceInput->Append(_("Initial velocity")); + m_inputFlags.push_back(IOControl::IN_INITIAL_VELOCITY); + if(m_ioControl->GetValue() == IOControl::IN_INITIAL_VELOCITY) inChoiceNumber = (int)m_inputFlags.size() - 1; } if(inChoiceNumber != -1) { -- cgit From aa2378020ee0bbfd041681cfdbe62a8d028687f3 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sun, 8 Oct 2017 22:49:52 -0300 Subject: Velocity variaton input implemented For PSS control on AVR --- Project/IOControlForm.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Project/IOControlForm.cpp') diff --git a/Project/IOControlForm.cpp b/Project/IOControlForm.cpp index bb049a1..73ac331 100644 --- a/Project/IOControlForm.cpp +++ b/Project/IOControlForm.cpp @@ -77,6 +77,12 @@ IOControlForm::IOControlForm(wxWindow* parent, IOControl* ioControl) : IOControl m_inputFlags.push_back(IOControl::IN_INITIAL_VELOCITY); if(m_ioControl->GetValue() == IOControl::IN_INITIAL_VELOCITY) inChoiceNumber = (int)m_inputFlags.size() - 1; } + + if(ioFlags & IOControl::IN_DELTA_VELOCITY) { + m_choiceInput->Append(_("Velocity variation")); + m_inputFlags.push_back(IOControl::IN_DELTA_VELOCITY); + if(m_ioControl->GetValue() == IOControl::IN_DELTA_VELOCITY) inChoiceNumber = (int)m_inputFlags.size() - 1; + } if(inChoiceNumber != -1) { m_choiceInput->SetSelection(inChoiceNumber); -- cgit From eea796f53f5d9dc1444a620713b3326f04b73339 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 9 Oct 2017 22:17:10 -0300 Subject: Divider control element implemented Abstract class math operations implemented Divider need to be redesigned Expor/import divider functions implemented but supressed --- Project/IOControlForm.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Project/IOControlForm.cpp') diff --git a/Project/IOControlForm.cpp b/Project/IOControlForm.cpp index 73ac331..4a25468 100644 --- a/Project/IOControlForm.cpp +++ b/Project/IOControlForm.cpp @@ -77,13 +77,19 @@ IOControlForm::IOControlForm(wxWindow* parent, IOControl* ioControl) : IOControl m_inputFlags.push_back(IOControl::IN_INITIAL_VELOCITY); if(m_ioControl->GetValue() == IOControl::IN_INITIAL_VELOCITY) inChoiceNumber = (int)m_inputFlags.size() - 1; } - + if(ioFlags & IOControl::IN_DELTA_VELOCITY) { m_choiceInput->Append(_("Velocity variation")); m_inputFlags.push_back(IOControl::IN_DELTA_VELOCITY); if(m_ioControl->GetValue() == IOControl::IN_DELTA_VELOCITY) inChoiceNumber = (int)m_inputFlags.size() - 1; } + if(ioFlags & IOControl::IN_DELTA_ACTIVE_POWER) { + m_choiceInput->Append(_("Active power variation")); + m_inputFlags.push_back(IOControl::IN_DELTA_ACTIVE_POWER); + if(m_ioControl->GetValue() == IOControl::IN_DELTA_ACTIVE_POWER) inChoiceNumber = (int)m_inputFlags.size() - 1; + } + if(inChoiceNumber != -1) { m_choiceInput->SetSelection(inChoiceNumber); m_checkBoxInput->SetValue(true); -- cgit