diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-01-06 20:52:54 -0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 20:52:54 -0200 |
| commit | b44aa5ce9401889d948149cc100d1b2ef3611d04 (patch) | |
| tree | 42a64542d07a4997be5e216ffd54a27e39f76b56 /Project/SyncMotor.cpp | |
| parent | 9df133274802731220546d1f9383c213193c8413 (diff) | |
| parent | 2cd589742c6a4fd289d2f0696d844ccf18b917cb (diff) | |
| download | PSP.git-b44aa5ce9401889d948149cc100d1b2ef3611d04.tar.gz PSP.git-b44aa5ce9401889d948149cc100d1b2ef3611d04.tar.xz PSP.git-b44aa5ce9401889d948149cc100d1b2ef3611d04.zip | |
Merge pull request #19 from Thales1330/bugfix/power-elements
Bugfix on power elements
Diffstat (limited to 'Project/SyncMotor.cpp')
| -rw-r--r-- | Project/SyncMotor.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Project/SyncMotor.cpp b/Project/SyncMotor.cpp index ba45906..c1e1986 100644 --- a/Project/SyncMotor.cpp +++ b/Project/SyncMotor.cpp @@ -116,7 +116,9 @@ wxString SyncMotor::GetTipText() const { wxString tipText = m_electricalData.name; tipText += "\n"; - tipText += _("\nP = ") + wxString::FromDouble(m_electricalData.activePower, 5); + double activePower = m_electricalData.activePower; + if(!m_online) activePower = 0.0; + tipText += _("\nP = ") + wxString::FromDouble(activePower, 5); switch(m_electricalData.activePowerUnit) { case UNIT_PU: { tipText += _(" p.u."); @@ -133,7 +135,9 @@ wxString SyncMotor::GetTipText() const default: break; } - tipText += _("\nQ = ") + wxString::FromDouble(m_electricalData.reactivePower, 5); + double reactivePower = m_electricalData.reactivePower; + if(!m_online) reactivePower = 0.0; + tipText += _("\nQ = ") + wxString::FromDouble(reactivePower, 5); switch(m_electricalData.reactivePowerUnit) { case UNIT_PU: { tipText += _(" p.u."); @@ -150,6 +154,6 @@ wxString SyncMotor::GetTipText() const default: break; } - + return tipText; } |