1 files changed, 24 insertions, 24 deletions

diff --git a/Project/Load.cpp b/Project/Load.cpp
index 22c9cd9..41ea255 100644
--- a/Project/Load.cpp
+++ b/Project/Load.cpp
@@ -48,7 +48,7 @@ bool Load::AddParent(Element* parent, wxPoint2DDouble position)
         wxRect2DDouble genRect(0, 0, 0, 0);
         m_switchRect.push_back(genRect);  // Push a general rectangle.
         UpdateSwitches();
-        m_pfDirection = PF_TO_ELEMENT;
+        m_pfDirection = PowerFlowDirection::PF_TO_ELEMENT;
         UpdatePowerFlowArrowsPosition();
 
         return true;
@@ -220,33 +220,33 @@ LoadElectricalData Load::GetPUElectricalData(double systemPowerBase)
 {
     LoadElectricalData data = m_electricalData;
     switch(data.activePowerUnit) {
-        case UNIT_W: {
+        case ElectricalUnit::UNIT_W: {
             data.activePower = data.activePower / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
+            data.activePowerUnit = ElectricalUnit::UNIT_PU;
         } break;
-        case UNIT_kW: {
+        case ElectricalUnit::UNIT_kW: {
             data.activePower = (data.activePower * 1e3) / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
+            data.activePowerUnit = ElectricalUnit::UNIT_PU;
         } break;
-        case UNIT_MW: {
+        case ElectricalUnit::UNIT_MW: {
             data.activePower = (data.activePower * 1e6) / systemPowerBase;
-            data.activePowerUnit = UNIT_PU;
+            data.activePowerUnit = ElectricalUnit::UNIT_PU;
         } break;
         default:
             break;
     }
     switch(data.reactivePowerUnit) {
-        case UNIT_VAr: {
+        case ElectricalUnit::UNIT_var: {
             data.reactivePower = data.reactivePower / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
+            data.reactivePowerUnit = ElectricalUnit::UNIT_PU;
         } break;
-        case UNIT_kVAr: {
+        case ElectricalUnit::UNIT_kvar: {
             data.reactivePower = (data.reactivePower * 1e3) / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
+            data.reactivePowerUnit = ElectricalUnit::UNIT_PU;
         } break;
-        case UNIT_MVAr: {
+        case ElectricalUnit::UNIT_Mvar: {
             data.reactivePower = (data.reactivePower * 1e6) / systemPowerBase;
-            data.reactivePowerUnit = UNIT_PU;
+            data.reactivePowerUnit = ElectricalUnit::UNIT_PU;
         } break;
         default:
             break;
@@ -281,16 +281,16 @@ wxString Load::GetTipText() const
     tipText += "\n";
     tipText += _("\nP = ") + wxString::FromDouble(activePower, 5);
     switch(m_electricalData.activePowerUnit) {
-        case UNIT_PU: {
+        case ElectricalUnit::UNIT_PU: {
             tipText += _(" p.u.");
         } break;
-        case UNIT_W: {
+        case ElectricalUnit::UNIT_W: {
             tipText += _(" W");
         } break;
-        case UNIT_kW: {
+        case ElectricalUnit::UNIT_kW: {
             tipText += _(" kW");
         } break;
-        case UNIT_MW: {
+        case ElectricalUnit::UNIT_MW: {
             tipText += _(" MW");
         } break;
         default:
@@ -298,16 +298,16 @@ wxString Load::GetTipText() const
     }
     tipText += _("\nQ = ") + wxString::FromDouble(reactivePower, 5);
     switch(m_electricalData.reactivePowerUnit) {
-        case UNIT_PU: {
+        case ElectricalUnit::UNIT_PU: {
             tipText += _(" p.u.");
         } break;
-        case UNIT_VAr: {
+        case ElectricalUnit::UNIT_var: {
             tipText += _(" VAr");
         } break;
-        case UNIT_kVAr: {
+        case ElectricalUnit::UNIT_kvar: {
             tipText += _(" kVAr");
         } break;
-        case UNIT_MVAr: {
+        case ElectricalUnit::UNIT_Mvar: {
             tipText += _(" MVAr");
         } break;
         default:
@@ -321,7 +321,7 @@ bool Load::GetPlotData(ElementPlotData& plotData, PlotStudy study)
 {
     if(!m_electricalData.plotLoad) return false;
     plotData.SetName(m_electricalData.name);
-    plotData.SetCurveType(ElementPlotData::CT_LOAD);
+    plotData.SetCurveType(ElementPlotData::CurveType::CT_LOAD);
 
     std::vector<double> absVoltage, activePower, reactivePower, current;
     for(unsigned int i = 0; i < m_electricalData.voltageVector.size(); ++i) {
@@ -354,10 +354,10 @@ rapidxml::xml_node<>* Load::SaveElement(rapidxml::xml_document<>& doc, rapidxml:
     XMLParser::SetNodeValue(doc, name, m_electricalData.name);
     auto activePower = XMLParser::AppendNode(doc, electricalProp, "ActivePower");
     XMLParser::SetNodeValue(doc, activePower, m_electricalData.activePower);
-    XMLParser::SetNodeAttribute(doc, activePower, "UnitID", m_electricalData.activePowerUnit);
+    XMLParser::SetNodeAttribute(doc, activePower, "UnitID", static_cast<int>(m_electricalData.activePowerUnit));
     auto reactivePower = XMLParser::AppendNode(doc, electricalProp, "ReactivePower");
     XMLParser::SetNodeValue(doc, reactivePower, m_electricalData.reactivePower);
-    XMLParser::SetNodeAttribute(doc, reactivePower, "UnitID", m_electricalData.reactivePowerUnit);
+    XMLParser::SetNodeAttribute(doc, reactivePower, "UnitID", static_cast<int>(m_electricalData.reactivePowerUnit));
     auto loadType = XMLParser::AppendNode(doc, electricalProp, "LoadType");
     XMLParser::SetNodeValue(doc, loadType, m_electricalData.loadType);