diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-07 17:56:03 -0300 |
---|---|---|
committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-07 17:56:03 -0300 |
commit | 2552edfb5608ae15600aac38622354fe46701002 (patch) | |
tree | d7e8dfac1cb82081bc21577af8057abeec88f8d2 /Project/GeneratorStabForm.cpp | |
parent | ae9530685962e8d4d88c871ec7f5f896dd0b4a93 (diff) | |
download | PSP.git-2552edfb5608ae15600aac38622354fe46701002.tar.gz PSP.git-2552edfb5608ae15600aac38622354fe46701002.tar.xz PSP.git-2552edfb5608ae15600aac38622354fe46701002.zip |
MIMO fully implemented
Electromechanical adjusted
Some control editor bugfixes
Diffstat (limited to 'Project/GeneratorStabForm.cpp')
-rw-r--r-- | Project/GeneratorStabForm.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp index 34f8027..82d85ab 100644 --- a/Project/GeneratorStabForm.cpp +++ b/Project/GeneratorStabForm.cpp @@ -69,7 +69,8 @@ void GeneratorStabForm::OnEditAVRButtonClick(wxCommandEvent& event) } ControlEditor* cEditor = new ControlEditor( m_parent, IOControl::IN_TERMINAL_VOLTAGE | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | - IOControl::IN_INITIAL_TERMINAL_VOLTAGE | IOControl::OUT_FIELD_VOLTAGE); + IOControl::IN_INITIAL_TERMINAL_VOLTAGE | IOControl::IN_VELOCITY | IOControl::IN_INITIAL_VELOCITY | + IOControl::OUT_FIELD_VOLTAGE); cEditor->SetElementsList(data.avr->GetControlElementsList()); cEditor->SetConnectionsList(data.avr->GetConnectionLineList()); cEditor->SetControlContainer(data.avr); @@ -88,9 +89,9 @@ void GeneratorStabForm::OnSpeedGovernorButtonClick(wxCommandEvent& event) data.speedGov = new ControlElementContainer(); m_syncGenerator->SetElectricalData(data); } - ControlEditor* cEditor = - new ControlEditor(m_parent, IOControl::IN_VELOCITY | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | - IOControl::IN_INITIAL_VELOCITY | IOControl::OUT_MEC_POWER); + ControlEditor* cEditor = new ControlEditor( + m_parent, IOControl::IN_VELOCITY | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | + IOControl::IN_INITIAL_VELOCITY | IOControl::IN_INITIAL_MEC_POWER | IOControl::OUT_MEC_POWER); cEditor->SetElementsList(data.speedGov->GetControlElementsList()); cEditor->SetConnectionsList(data.speedGov->GetConnectionLineList()); cEditor->SetControlContainer(data.speedGov); |