summaryrefslogtreecommitdiffstats
path: root/Project/Text.cpp
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2019-07-18 09:22:27 -0300
committerGitHub <noreply@github.com>2019-07-18 09:22:27 -0300
commit8357c081eb75147bb8f94d8b6e367d88ea3898ed (patch)
tree9d9726fdcefb917475d6b33344d2b832d4e78ef8 /Project/Text.cpp
parent295b775ad53eb1e128b705e6028f9690dc6fa640 (diff)
parent7f46d390b8cc1d5f37560f52b222198dbc5e1225 (diff)
downloadPSP.git-8357c081eb75147bb8f94d8b6e367d88ea3898ed.tar.gz
PSP.git-8357c081eb75147bb8f94d8b6e367d88ea3898ed.tar.xz
PSP.git-8357c081eb75147bb8f94d8b6e367d88ea3898ed.zip
Merge pull request #50 from Thales1330/wip/induction-motor
Wip/induction motor
Diffstat (limited to 'Project/Text.cpp')
-rw-r--r--Project/Text.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/Project/Text.cpp b/Project/Text.cpp
index 0697ac5..f73b425 100644
--- a/Project/Text.cpp
+++ b/Project/Text.cpp
@@ -270,6 +270,9 @@ void Text::UpdateText(double systemPowerBase)
break;
}
} break;
+ case DATA_PQ_THD: {
+ SetText("THD = " + wxString::FromDouble(data.thd, m_decimalPlaces) + "\%");
+ } break;
default:
break;
}
@@ -913,6 +916,19 @@ void Text::UpdateText(double systemPowerBase)
}
}
} break;
+ case TYPE_HARMCURRENT: {
+ HarmCurrent* harmCurrent = static_cast<HarmCurrent*>(m_element);
+ if(harmCurrent) {
+ auto data = harmCurrent->GetElectricalData();
+ switch(m_dataType) {
+ case DATA_NAME: {
+ SetText(data.name);
+ } break;
+ default:
+ break;
+ }
+ }
+ } break;
}
}