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/IOControl.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Project/IOControl.cpp') diff --git a/Project/IOControl.cpp b/Project/IOControl.cpp index bf40200..da3ef03 100644 --- a/Project/IOControl.cpp +++ b/Project/IOControl.cpp @@ -178,6 +178,14 @@ wxString IOControl::GenerateText() m_ioNodeType = Node::NODE_IN; return _("Pm"); } break; + case IN_INITIAL_TERMINAL_VOLTAGE: { + m_ioNodeType = Node::NODE_IN; + return _("Vt0"); + } break; + case IN_INITIAL_MEC_POWER: { + m_ioNodeType = Node::NODE_IN; + return _("Pm0"); + } break; } return ""; } -- 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/IOControl.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Project/IOControl.cpp') diff --git a/Project/IOControl.cpp b/Project/IOControl.cpp index da3ef03..2479f47 100644 --- a/Project/IOControl.cpp +++ b/Project/IOControl.cpp @@ -152,6 +152,7 @@ void IOControl::Rotate(bool clockwise) wxString IOControl::GenerateText() { wxString omega = wxString::FromUTF8("\xCF\x89"); + wxString subZero = wxString::FromUTF8("\xE2\x82\x92"); switch(m_value) { case IN_TERMINAL_VOLTAGE: { @@ -179,12 +180,16 @@ wxString IOControl::GenerateText() return _("Pm"); } break; case IN_INITIAL_TERMINAL_VOLTAGE: { - m_ioNodeType = Node::NODE_IN; - return _("Vt0"); + m_ioNodeType = Node::NODE_OUT; + return _("Vt") + subZero; } break; case IN_INITIAL_MEC_POWER: { - m_ioNodeType = Node::NODE_IN; - return _("Pm0"); + m_ioNodeType = Node::NODE_OUT; + return _("Pm") + subZero; + } break; + case IN_INITIAL_VELOCITY: { + m_ioNodeType = Node::NODE_OUT; + return omega + subZero; } break; } return ""; -- 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/IOControl.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Project/IOControl.cpp') diff --git a/Project/IOControl.cpp b/Project/IOControl.cpp index 2479f47..aef7944 100644 --- a/Project/IOControl.cpp +++ b/Project/IOControl.cpp @@ -153,6 +153,7 @@ wxString IOControl::GenerateText() { wxString omega = wxString::FromUTF8("\xCF\x89"); wxString subZero = wxString::FromUTF8("\xE2\x82\x92"); + wxString capDelta = wxString::FromUTF8("\xCE\x94"); switch(m_value) { case IN_TERMINAL_VOLTAGE: { @@ -191,6 +192,10 @@ wxString IOControl::GenerateText() m_ioNodeType = Node::NODE_OUT; return omega + subZero; } break; + case IN_DELTA_VELOCITY: { + m_ioNodeType = Node::NODE_OUT; + return capDelta + omega; + } break; } return ""; } -- 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/IOControl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Project/IOControl.cpp') diff --git a/Project/IOControl.cpp b/Project/IOControl.cpp index aef7944..44cbf8e 100644 --- a/Project/IOControl.cpp +++ b/Project/IOControl.cpp @@ -166,11 +166,11 @@ wxString IOControl::GenerateText() } break; case IN_ACTIVE_POWER: { m_ioNodeType = Node::NODE_OUT; - return _("Pe"); + return _("P"); } break; case IN_REACTIVE_POWER: { m_ioNodeType = Node::NODE_OUT; - return _("Qe"); + return _("Q"); } break; case OUT_FIELD_VOLTAGE: { m_ioNodeType = Node::NODE_IN; @@ -196,6 +196,10 @@ wxString IOControl::GenerateText() m_ioNodeType = Node::NODE_OUT; return capDelta + omega; } break; + case IN_DELTA_ACTIVE_POWER: { + m_ioNodeType = Node::NODE_OUT; + return capDelta + _("P"); + } break; } return ""; } -- cgit