summaryrefslogtreecommitdiffstats
path: root/Project/IOControlForm.cpp
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2017-10-11 19:26:19 -0300
committerGitHub <noreply@github.com>2017-10-11 19:26:19 -0300
commit28760ff098cf5ef68cb95c869c2cd96ea5c324ec (patch)
tree9eea1f1d2622446b3bf64d8cf0864c9a9aafad34 /Project/IOControlForm.cpp
parenta32372968abb2f4b3bf0472f59c18f5028d20206 (diff)
parent7fb65c6ec6148a75830ad25b7f76500c17db0f3b (diff)
downloadPSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.gz
PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.tar.xz
PSP.git-28760ff098cf5ef68cb95c869c2cd96ea5c324ec.zip
Merge pull request #40 from Thales1330/wip-mimo-control-system
Wip mimo control system
Diffstat (limited to 'Project/IOControlForm.cpp')
-rw-r--r--Project/IOControlForm.cpp31
1 files changed, 31 insertions, 0 deletions
diff --git a/Project/IOControlForm.cpp b/Project/IOControlForm.cpp
index 583e534..4a25468 100644
--- a/Project/IOControlForm.cpp
+++ b/Project/IOControlForm.cpp
@@ -59,6 +59,37 @@ 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_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_choiceInput->Append(_("Initial terminal voltage"));
+ m_inputFlags.push_back(IOControl::IN_INITIAL_TERMINAL_VOLTAGE);
+ if(m_ioControl->GetValue() == IOControl::IN_INITIAL_TERMINAL_VOLTAGE)
+ inChoiceNumber = (int)m_inputFlags.size() - 1;
+ }
+
+ if(ioFlags & IOControl::IN_INITIAL_VELOCITY) {
+ 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(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);