From 9e1f6849c929506a17fa12185c5c0185d5287177 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 8 Sep 2017 22:02:09 -0300 Subject: More grid data implemented Some fault bugfixes --- Project/Line.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Project/Line.h') diff --git a/Project/Line.h b/Project/Line.h index 9cea359..513dc11 100644 --- a/Project/Line.h +++ b/Project/Line.h @@ -21,8 +21,8 @@ struct LineElectricalData { bool useLinePower = false; // Power flow (p.u.) - std::complex current[2] = { std::complex(0.0, 0.0), std::complex(0.0, 0.0) }; - std::complex powerFlow[2] = { std::complex(0.0, 0.0), std::complex(0.0, 0.0) }; + std::complex current[2] = {std::complex(0.0, 0.0), std::complex(0.0, 0.0)}; + std::complex powerFlow[2] = {std::complex(0.0, 0.0), std::complex(0.0, 0.0)}; // Fault double zeroResistance = 0.0; @@ -34,7 +34,7 @@ struct LineElectricalData { class Line : public Branch { -public: + public: Line(); Line(wxString name); ~Line(); @@ -60,14 +60,14 @@ public: virtual void SetPowerFlowDirection(PowerFlowDirection pfDirection); virtual bool ShowForm(wxWindow* parent, Element* element); virtual LineElectricalData GetElectricalData() const { return m_electricalData; } - virtual LineElectricalData GetPUElectricalData(double basePower) const; + virtual LineElectricalData GetPUElectricalData(double systemBasePower); virtual void SetElectricalData(LineElectricalData electricalData) { m_electricalData = electricalData; } virtual void SetNominalVoltage(std::vector nominalVoltage, std::vector nominalVoltageUnit); virtual void SetPointList(std::vector pointList); -protected: + protected: void UpdatePowerFlowArrowsPosition(); LineElectricalData m_electricalData; }; -#endif // LINE_H +#endif // LINE_H -- cgit