1 files changed, 136 insertions, 176 deletions

diff --git a/Project/BusForm.cpp b/Project/BusForm.cpp
index c9d78a6..d7d622e 100644
--- a/Project/BusForm.cpp
+++ b/Project/BusForm.cpp
@@ -1,7 +1,8 @@
 #include "BusForm.h"
 #include "Bus.h"
 
-BusForm::BusForm(wxWindow* parent, Bus* bus) : BusFormBase(parent)
+BusForm::BusForm(wxWindow* parent, Bus* bus)
+    : BusFormBase(parent)
 {
     SetSize(GetBestSize());
 
@@ -9,73 +10,57 @@ BusForm::BusForm(wxWindow* parent, Bus* bus) : BusFormBase(parent)
     m_bus = bus;
 
     m_textCtrlName->SetValue(bus->GetEletricalData().name);
-    m_textCtrlNomVoltage->SetValue(wxString::FromDouble(bus->GetEletricalData().nominalVoltage));
+    m_textCtrlNomVoltage->SetValue(bus->StringFromDouble(bus->GetEletricalData().nominalVoltage));
 
     if(bus->GetEletricalData().nominalVoltageUnit == UNIT_V)
-	m_choiceNomVoltage->SetSelection(0);
+        m_choiceNomVoltage->SetSelection(0);
     else
-	m_choiceNomVoltage->SetSelection(1);
+        m_choiceNomVoltage->SetSelection(1);
 
     m_checkBoxCtrlVoltage->SetValue(bus->GetEletricalData().isVoltageControlled);
-    m_textCtrlCtrlVoltage->SetValue(wxString::FromDouble(bus->GetEletricalData().controlledVoltage));
+    m_textCtrlCtrlVoltage->SetValue(bus->StringFromDouble(bus->GetEletricalData().controlledVoltage));
     m_choiceCtrlVoltage->SetSelection(bus->GetEletricalData().controlledVoltageUnitChoice);
     m_checkBoxSlackBus->SetValue(bus->GetEletricalData().slackBus);
 
     m_checkBoxFault->SetValue(bus->GetEletricalData().hasFault);
-    switch(bus->GetEletricalData().faultType)
-	{
-	    case FAULT_THREEPHASE:
-		{
-		    m_choiceFaultType->SetSelection(0);
-		}
-		break;
-	    case FAULT_2LINE:
-		{
-		    m_choiceFaultType->SetSelection(1);
-		}
-		break;
-	    case FAULT_2LINE_GROUND:
-		{
-		    m_choiceFaultType->SetSelection(2);
-		}
-		break;
-	    case FAULT_LINE_GROUND:
-		{
-		    m_choiceFaultType->SetSelection(3);
-		}
-		break;
-	    default:
-		break;
-	}
-    switch(bus->GetEletricalData().faultLocation)
-	{
-	    case FAULT_LINE_A:
-		{
-		    m_choiceFaultPlace->SetSelection(0);
-		}
-		break;
-	    case FAULT_LINE_B:
-		{
-		    m_choiceFaultPlace->SetSelection(1);
-		}
-		break;
-	    case FAULT_LINE_C:
-		{
-		    m_choiceFaultPlace->SetSelection(2);
-		}
-		break;
-	    default:
-		break;
-	}
-    m_textCtrlFaultResistance->SetValue(wxString::FromDouble(bus->GetEletricalData().faultResistance));
-    m_textCtrlFaultReactance->SetValue(wxString::FromDouble(bus->GetEletricalData().faultReactance));
+    switch(bus->GetEletricalData().faultType) {
+        case FAULT_THREEPHASE: {
+            m_choiceFaultType->SetSelection(0);
+        } break;
+        case FAULT_2LINE: {
+            m_choiceFaultType->SetSelection(1);
+        } break;
+        case FAULT_2LINE_GROUND: {
+            m_choiceFaultType->SetSelection(2);
+        } break;
+        case FAULT_LINE_GROUND: {
+            m_choiceFaultType->SetSelection(3);
+        } break;
+        default:
+            break;
+    }
+    switch(bus->GetEletricalData().faultLocation) {
+        case FAULT_LINE_A: {
+            m_choiceFaultPlace->SetSelection(0);
+        } break;
+        case FAULT_LINE_B: {
+            m_choiceFaultPlace->SetSelection(1);
+        } break;
+        case FAULT_LINE_C: {
+            m_choiceFaultPlace->SetSelection(2);
+        } break;
+        default:
+            break;
+    }
+    m_textCtrlFaultResistance->SetValue(bus->StringFromDouble(bus->GetEletricalData().faultResistance));
+    m_textCtrlFaultReactance->SetValue(bus->StringFromDouble(bus->GetEletricalData().faultReactance));
 
     m_checkBoxPlotData->SetValue(bus->GetEletricalData().plotBus);
     m_checkBoxStabFault->SetValue(bus->GetEletricalData().stabHasFault);
-    m_textCtrlStabFaultTime->SetValue(wxString::FromDouble(bus->GetEletricalData().stabFaultTime));
-    m_textCtrlStabFaultLength->SetValue(wxString::FromDouble(bus->GetEletricalData().stabFaultLength));
-    m_textCtrlStabFaultResistance->SetValue(wxString::FromDouble(bus->GetEletricalData().stabFaultResistance));
-    m_textCtrlStabFaultReactance->SetValue(wxString::FromDouble(bus->GetEletricalData().stabFaultReactance));
+    m_textCtrlStabFaultTime->SetValue(bus->StringFromDouble(bus->GetEletricalData().stabFaultTime));
+    m_textCtrlStabFaultLength->SetValue(bus->StringFromDouble(bus->GetEletricalData().stabFaultLength));
+    m_textCtrlStabFaultResistance->SetValue(bus->StringFromDouble(bus->GetEletricalData().stabFaultResistance));
+    m_textCtrlStabFaultReactance->SetValue(bus->StringFromDouble(bus->GetEletricalData().stabFaultReactance));
 
     EnableCtrlVoltageFields(bus->GetEletricalData().isVoltageControlled);
     EnableFaultFields(bus->GetEletricalData().hasFault);
@@ -89,88 +74,72 @@ void BusForm::OnButtonOKClick(wxCommandEvent& event)
     BusElectricalData data = m_bus->GetEletricalData();
     data.name = m_textCtrlName->GetValue();
     if(!m_bus->DoubleFromString(m_parent, m_textCtrlNomVoltage->GetValue(), data.nominalVoltage,
-                                _("Value entered incorrectly in the field \"Nominal voltage\".")))
-	return;
+           _("Value entered incorrectly in the field \"Rated voltage\".")))
+        return;
     data.nominalVoltageUnit = m_choiceNomVoltage->GetSelection() == 0 ? UNIT_V : UNIT_kV;
     data.isVoltageControlled = m_checkBoxCtrlVoltage->GetValue();
     if(data.isVoltageControlled) {
-	    if(!m_bus->DoubleFromString(m_parent, m_textCtrlCtrlVoltage->GetValue(), data.controlledVoltage,
-	                                _("Value entered incorrectly in the field \"Controlled voltage\".")))
-		return;
-	    data.controlledVoltageUnitChoice = m_choiceCtrlVoltage->GetSelection();
-	}
+        if(!m_bus->DoubleFromString(m_parent, m_textCtrlCtrlVoltage->GetValue(), data.controlledVoltage,
+               _("Value entered incorrectly in the field \"Controlled voltage\".")))
+            return;
+        data.controlledVoltageUnitChoice = m_choiceCtrlVoltage->GetSelection();
+    }
     data.slackBus = m_checkBoxSlackBus->GetValue();
-	
-	data.hasFault = m_checkBoxFault->GetValue();
-	switch(m_choiceFaultType->GetSelection())
-	{
-		case 0:
-		{
-			data.faultType = FAULT_THREEPHASE;
-		}
-		break;
-		case 1:
-		{
-			data.faultType = FAULT_2LINE;
-		}
-		break;
-		case 2:
-		{
-			data.faultType = FAULT_2LINE_GROUND;
-		}
-		break;
-		case 3:
-		{
-			data.faultType = FAULT_LINE_GROUND;
-		}
-		break;
-	}
-	
-	switch(m_choiceFaultPlace->GetSelection())
-	{
-		case 0:
-		{
-			data.faultLocation = FAULT_LINE_A;
-		}
-		break;
-		case 1:
-		{
-			data.faultLocation = FAULT_LINE_B;
-		}
-		break;
-		case 2:
-		{
-			data.faultLocation = FAULT_LINE_C;
-		}
-		break;
-	}
-	
-	if(!m_bus->DoubleFromString(m_parent, m_textCtrlFaultResistance->GetValue(), data.faultResistance,
-                                _("Value entered incorrectly in the field \"Fault resistance\".")))
-	return;
-	
-	if(!m_bus->DoubleFromString(m_parent, m_textCtrlFaultReactance->GetValue(), data.faultReactance,
-                                _("Value entered incorrectly in the field \"Fault reactance\".")))
-	return;
-	
-	data.plotBus = m_checkBoxPlotData->GetValue();
-	data.stabHasFault = m_checkBoxStabFault->GetValue();
-	
-	if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultTime->GetValue(), data.stabFaultTime,
-                                _("Value entered incorrectly in the field \"Time\".")))
-	return;
-	
-	if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultLength->GetValue(), data.stabFaultLength,
-                                _("Value entered incorrectly in the field \"Fault lenght\".")))
-	return;
-	
-	if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultResistance->GetValue(), data.stabFaultResistance,
-                                _("Value entered incorrectly in the field \"Fault resistence (stability)\".")))
-	return;
-	
-	if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultReactance->GetValue(), data.stabFaultReactance,
-                                _("Value entered incorrectly in the field \"Fault reactance (stability)\".")))
-	return;
+
+    data.hasFault = m_checkBoxFault->GetValue();
+    switch(m_choiceFaultType->GetSelection()) {
+        case 0: {
+            data.faultType = FAULT_THREEPHASE;
+        } break;
+        case 1: {
+            data.faultType = FAULT_2LINE;
+        } break;
+        case 2: {
+            data.faultType = FAULT_2LINE_GROUND;
+        } break;
+        case 3: {
+            data.faultType = FAULT_LINE_GROUND;
+        } break;
+    }
+
+    switch(m_choiceFaultPlace->GetSelection()) {
+        case 0: {
+            data.faultLocation = FAULT_LINE_A;
+        } break;
+        case 1: {
+            data.faultLocation = FAULT_LINE_B;
+        } break;
+        case 2: {
+            data.faultLocation = FAULT_LINE_C;
+        } break;
+    }
+
+    if(!m_bus->DoubleFromString(m_parent, m_textCtrlFaultResistance->GetValue(), data.faultResistance,
+           _("Value entered incorrectly in the field \"Fault resistance\".")))
+        return;
+
+    if(!m_bus->DoubleFromString(m_parent, m_textCtrlFaultReactance->GetValue(), data.faultReactance,
+           _("Value entered incorrectly in the field \"Fault reactance\".")))
+        return;
+
+    data.plotBus = m_checkBoxPlotData->GetValue();
+    data.stabHasFault = m_checkBoxStabFault->GetValue();
+
+    if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultTime->GetValue(), data.stabFaultTime,
+           _("Value entered incorrectly in the field \"Time\".")))
+        return;
+
+    if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultLength->GetValue(), data.stabFaultLength,
+           _("Value entered incorrectly in the field \"Fault lenght\".")))
+        return;
+
+    if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultResistance->GetValue(), data.stabFaultResistance,
+           _("Value entered incorrectly in the field \"Fault resistence (stability)\".")))
+        return;
+
+    if(!m_bus->DoubleFromString(m_parent, m_textCtrlStabFaultReactance->GetValue(), data.stabFaultReactance,
+           _("Value entered incorrectly in the field \"Fault reactance (stability)\".")))
+        return;
 
     m_bus->SetElectricalData(data);
 
@@ -219,46 +188,37 @@ void BusForm::EnableStabFaultFields(bool enable)
 
 void BusForm::UpdateChoiceBoxes()
 {
-    switch(m_choiceFaultType->GetSelection())
-	{
-	    case 0:  // three-phase
-		{
-		    m_choiceFaultPlace->Enable(false);
-		}
-		break;
-	    case 1:  // line-to-line
-	    case 2:  // double line-to-line
-		{
-		    if(m_checkBoxFault->GetValue()) m_choiceFaultPlace->Enable(true);
-		    m_choiceFaultPlace->SetString(0, _("Lines AB"));
-		    m_choiceFaultPlace->SetString(1, _("Lines BC"));
-		    m_choiceFaultPlace->SetString(2, _("Lines CA"));
-		}
-		break;
-	    case 3:  // line-to-ground
-		{
-		    if(m_checkBoxFault->GetValue()) m_choiceFaultPlace->Enable(true);
-		    m_choiceFaultPlace->SetString(0, _("Line A"));
-		    m_choiceFaultPlace->SetString(1, _("Line B"));
-		    m_choiceFaultPlace->SetString(2, _("Line C"));
-		}
-		break;
-	    default:
-		break;
-	}
-    switch(m_choiceNomVoltage->GetSelection())
-	{
-	    case 0:
-		{
-		    m_choiceCtrlVoltage->SetString(1, _("V"));
-		}
-		break;
-	    case 1:
-		{
-		    m_choiceCtrlVoltage->SetString(1, _("kV"));
-		}
-		break;
-	    default:
-		break;
-	}
+    switch(m_choiceFaultType->GetSelection()) {
+        case 0: // three-phase
+        {
+            m_choiceFaultPlace->Enable(false);
+        } break;
+        case 1: // line-to-line
+        case 2: // double line-to-line
+        {
+            if(m_checkBoxFault->GetValue()) m_choiceFaultPlace->Enable(true);
+            m_choiceFaultPlace->SetString(0, _("Lines AB"));
+            m_choiceFaultPlace->SetString(1, _("Lines BC"));
+            m_choiceFaultPlace->SetString(2, _("Lines CA"));
+        } break;
+        case 3: // line-to-ground
+        {
+            if(m_checkBoxFault->GetValue()) m_choiceFaultPlace->Enable(true);
+            m_choiceFaultPlace->SetString(0, _("Line A"));
+            m_choiceFaultPlace->SetString(1, _("Line B"));
+            m_choiceFaultPlace->SetString(2, _("Line C"));
+        } break;
+        default:
+            break;
+    }
+    switch(m_choiceNomVoltage->GetSelection()) {
+        case 0: {
+            m_choiceCtrlVoltage->SetString(1, _("V"));
+        } break;
+        case 1: {
+            m_choiceCtrlVoltage->SetString(1, _("kV"));
+        } break;
+        default:
+            break;
+    }
 }