diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-06-02 21:47:06 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-06-02 21:47:06 -0300 |
| commit | 113a35d0fe8938973fa1c100b77f456ed250e61b (patch) | |
| tree | 586d1c3113082cbb2b92cd46c3c96a25a0e75e67 /Project/HarmCurrentForm.cpp | |
| parent | 6ce2bdcf85dffee6b6ef7b95b888b8b96372a3d6 (diff) | |
| download | PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.tar.gz PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.tar.xz PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.zip | |
OpenGL bugfixes and wxGC port alternative init
OpenGL major bugfixes;
Device context port alternative to OpenGL code init (WorkspaceDC). Some machines don't support OpenGL 3+;
Fixed some issues with MSVC.
Diffstat (limited to 'Project/HarmCurrentForm.cpp')
| -rw-r--r-- | Project/HarmCurrentForm.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Project/HarmCurrentForm.cpp b/Project/HarmCurrentForm.cpp index 812124c..3a14cc6 100644 --- a/Project/HarmCurrentForm.cpp +++ b/Project/HarmCurrentForm.cpp @@ -16,7 +16,7 @@ HarmCurrentForm::HarmCurrentForm(wxWindow* parent, HarmCurrent* harmCurrent) : H for(unsigned int i = 0; i < data.harmonicOrder.size(); ++i) { long item = m_listCtrlHarmCurrentList->InsertItem(m_maxID, wxString::Format("%d", data.harmonicOrder[i])); m_listCtrlHarmCurrentList->SetItem(item, 1, m_harmCurrent->StringFromDouble(data.injHarmCurrent[i], 1)); - m_listCtrlHarmCurrentList->SetItem(item, 2, data.injHarmCurrentUnit[i] == UNIT_A ? _("A") : _("p.u.")); + m_listCtrlHarmCurrentList->SetItem(item, 2, data.injHarmCurrentUnit[i] == ElectricalUnit::UNIT_A ? _("A") : _("p.u.")); m_listCtrlHarmCurrentList->SetItem(item, 3, m_harmCurrent->StringFromDouble(data.injHarmAngle[i], 1)); m_maxID++; } @@ -50,9 +50,9 @@ bool HarmCurrentForm::ValidateData() if(!m_listCtrlHarmCurrentList->GetItemText(item, 1).ToDouble(&injCurrent)) { return false; } injHarmCurrent.push_back(injCurrent); if(m_listCtrlHarmCurrentList->GetItemText(item, 2) == "A") - injHarmCurrentUnit.push_back(UNIT_A); + injHarmCurrentUnit.push_back(ElectricalUnit::UNIT_A); else - injHarmCurrentUnit.push_back(UNIT_PU); + injHarmCurrentUnit.push_back(ElectricalUnit::UNIT_PU); double injCAngle = 0.0; if(!m_listCtrlHarmCurrentList->GetItemText(item, 3).ToDouble(&injCAngle)) { return false; } injHarmAngle.push_back(injCAngle); @@ -124,9 +124,9 @@ void HarmCurrentForm::SortList() if(!m_listCtrlHarmCurrentList->GetItemText(item, 1).ToDouble(&injCurrent)) return; injHarmCurrent.push_back(injCurrent); if(m_listCtrlHarmCurrentList->GetItemText(item, 2) == "A") - injHarmCurrentUnit.push_back(UNIT_A); + injHarmCurrentUnit.push_back(ElectricalUnit::UNIT_A); else - injHarmCurrentUnit.push_back(UNIT_PU); + injHarmCurrentUnit.push_back(ElectricalUnit::UNIT_PU); double injCAngle = 0.0; if(!m_listCtrlHarmCurrentList->GetItemText(item, 3).ToDouble(&injCAngle)) return; injHarmAngle.push_back(injCAngle); @@ -165,7 +165,7 @@ void HarmCurrentForm::SortList() for(unsigned int i = 0; i < harmonicOrder.size(); ++i) { long item = m_listCtrlHarmCurrentList->InsertItem(m_maxID, wxString::Format("%d", harmonicOrder[i])); m_listCtrlHarmCurrentList->SetItem(item, 1, m_harmCurrent->StringFromDouble(injHarmCurrent[i], 1)); - m_listCtrlHarmCurrentList->SetItem(item, 2, injHarmCurrentUnit[i] == UNIT_A ? _("A") : _("p.u.")); + m_listCtrlHarmCurrentList->SetItem(item, 2, injHarmCurrentUnit[i] == ElectricalUnit::UNIT_A ? _("A") : _("p.u.")); m_listCtrlHarmCurrentList->SetItem(item, 3, m_harmCurrent->StringFromDouble(injHarmAngle[i], 1)); m_maxID++; } |