Transformer form under implementation

1 files changed, 19 insertions, 7 deletions

diff --git a/Project/Transformer.h b/Project/Transformer.h
index 835fc03..fb23618 100644
--- a/Project/Transformer.h
+++ b/Project/Transformer.h
@@ -22,23 +22,29 @@ struct TransformerElectricalData
 {
     // General
     wxString name = "";
-    double nominalVoltage = 138.0;
-    ElectricalUnit nominalVoltageUnit = UNIT_kV;
+    double primaryNominalVoltage = 138.0;
+    ElectricalUnit primaryNominalVoltageUnit = UNIT_kV;
+    double secondaryNominalVoltage = 138.0;
+    ElectricalUnit secondaryNominalVoltageUnit = UNIT_kV;
+    int baseVoltage = 0;
     double nominalPower = 100.0;
     ElectricalUnit nominalPowerUnit = UNIT_MVA;
     double resistance = 0.0;
     ElectricalUnit resistanceUnit = UNIT_PU;
     double indReactance = 1.0;
     ElectricalUnit indReactanceUnit = UNIT_PU;
-    double capSusceptance = 0.0;
-    ElectricalUnit capSusceptanceUnit = UNIT_PU;
-    double lineSize = 100.0;
-    bool useLinePower = false;
+    TransformerConnection connection = GWYE_GWYE;
+    double turnsRatio = 1.0;
+    double phaseShift = 0.0;
+    bool useTransformerPower = false;
 
     // Fault
     double zeroResistance = 0.0;
     double zeroIndReactance = 1.0;
-    double zeroCapSusceptance = 0.0;
+    double primaryGrndResistance = 0.0;
+    double primaryGrndReactance = 0.0;
+    double secondaryGrndResistance = 0.0;
+    double secondaryGrndReactance = 0.0;
 };
 
 class Transformer : public Branch
@@ -57,6 +63,12 @@ public:
 	virtual void StartMove(wxPoint2DDouble position);
 	virtual bool GetContextMenu(wxMenu& menu);
     virtual bool ShowForm(wxWindow* parent, Element* element);
+    virtual TransformerElectricalData GetElectricalData() { return m_electricalData; }
+    virtual void SetElectricaData(TransformerElectricalData electricalData) { m_electricalData = electricalData; }
+    virtual void SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit);
+    
+protected:
+    TransformerElectricalData m_electricalData;
 };
 
 #endif  // TRANSFORMER_H