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/GeneratorStabForm.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Project/GeneratorStabForm.cpp') diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp index 7a68391..34f8027 100644 --- a/Project/GeneratorStabForm.cpp +++ b/Project/GeneratorStabForm.cpp @@ -67,7 +67,9 @@ void GeneratorStabForm::OnEditAVRButtonClick(wxCommandEvent& event) data.avr = new ControlElementContainer(); m_syncGenerator->SetElectricalData(data); } - ControlEditor* cEditor = new ControlEditor(m_parent, IOControl::IN_TERMINAL_VOLTAGE | IOControl::OUT_FIELD_VOLTAGE); + 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); cEditor->SetElementsList(data.avr->GetControlElementsList()); cEditor->SetConnectionsList(data.avr->GetConnectionLineList()); cEditor->SetControlContainer(data.avr); @@ -86,7 +88,9 @@ void GeneratorStabForm::OnSpeedGovernorButtonClick(wxCommandEvent& event) data.speedGov = new ControlElementContainer(); m_syncGenerator->SetElectricalData(data); } - ControlEditor* cEditor = new ControlEditor(m_parent, IOControl::IN_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::OUT_MEC_POWER); cEditor->SetElementsList(data.speedGov->GetControlElementsList()); cEditor->SetConnectionsList(data.speedGov->GetConnectionLineList()); cEditor->SetControlContainer(data.speedGov); -- 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/GeneratorStabForm.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Project/GeneratorStabForm.cpp') 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); -- 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/GeneratorStabForm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/GeneratorStabForm.cpp') diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp index 82d85ab..7a70039 100644 --- a/Project/GeneratorStabForm.cpp +++ b/Project/GeneratorStabForm.cpp @@ -70,7 +70,7 @@ 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::IN_VELOCITY | IOControl::IN_INITIAL_VELOCITY | - IOControl::OUT_FIELD_VOLTAGE); + IOControl::IN_DELTA_VELOCITY | IOControl::OUT_FIELD_VOLTAGE); cEditor->SetElementsList(data.avr->GetControlElementsList()); cEditor->SetConnectionsList(data.avr->GetConnectionLineList()); cEditor->SetControlContainer(data.avr); -- 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/GeneratorStabForm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/GeneratorStabForm.cpp') diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp index 7a70039..9a468b7 100644 --- a/Project/GeneratorStabForm.cpp +++ b/Project/GeneratorStabForm.cpp @@ -70,7 +70,7 @@ 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::IN_VELOCITY | IOControl::IN_INITIAL_VELOCITY | - IOControl::IN_DELTA_VELOCITY | IOControl::OUT_FIELD_VOLTAGE); + IOControl::IN_DELTA_VELOCITY | IOControl::IN_DELTA_ACTIVE_POWER | IOControl::OUT_FIELD_VOLTAGE); cEditor->SetElementsList(data.avr->GetControlElementsList()); cEditor->SetConnectionsList(data.avr->GetConnectionLineList()); cEditor->SetControlContainer(data.avr); -- cgit