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/DataReport.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/DataReport.cpp')
| -rw-r--r-- | Project/DataReport.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Project/DataReport.cpp b/Project/DataReport.cpp index 1511079..49572b7 100644 --- a/Project/DataReport.cpp +++ b/Project/DataReport.cpp @@ -335,10 +335,10 @@ void DataReport::FillValues(GridSelection gridToFill) double basePower = m_workspace->GetProperties()->GetSimulationPropertiesData().basePower; switch(m_workspace->GetProperties()->GetSimulationPropertiesData().basePowerUnit) { - case UNIT_kVA: { + case ElectricalUnit::UNIT_kVA: { basePower *= 1e3; } break; - case UNIT_MVA: { + case ElectricalUnit::UNIT_MVA: { basePower *= 1e6; } break; default: @@ -485,7 +485,7 @@ void DataReport::FillValues(GridSelection gridToFill) auto data = bus->GetElectricalData(); double vb = std::abs(data.nominalVoltage); - if(data.nominalVoltageUnit == UNIT_kV) vb *= 1e3; + if(data.nominalVoltageUnit == ElectricalUnit::UNIT_kV) vb *= 1e3; double kVoltage = 1.0; if(m_gridPFBuses->GetCellValue(0, 2) == m_voltageChoices[1]) kVoltage = vb; @@ -523,7 +523,7 @@ void DataReport::FillValues(GridSelection gridToFill) auto data = line->GetPUElectricalData(basePower); double vb = data.nominalVoltage; - if(data.nominalVoltageUnit == UNIT_kV) vb *= 1e3; + if(data.nominalVoltageUnit == ElectricalUnit::UNIT_kV) vb *= 1e3; double zb = (vb * vb) / basePower; wxString busName1 = "-"; @@ -567,10 +567,10 @@ void DataReport::FillValues(GridSelection gridToFill) double vb = 0.0; if(data.baseVoltage == 0) { vb = data.primaryNominalVoltage; - if(data.primaryNominalVoltageUnit == UNIT_kV) vb *= 1e3; + if(data.primaryNominalVoltageUnit == ElectricalUnit::UNIT_kV) vb *= 1e3; } else { vb = data.secondaryNominalVoltage; - if(data.secondaryNominalVoltageUnit == UNIT_kV) vb *= 1e3; + if(data.secondaryNominalVoltageUnit == ElectricalUnit::UNIT_kV) vb *= 1e3; } double zb = (vb * vb) / basePower; |