diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-09-08 22:02:09 -0300 |
---|---|---|
committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-09-08 22:02:09 -0300 |
commit | 9e1f6849c929506a17fa12185c5c0185d5287177 (patch) | |
tree | 2706096d34de7f715ff55abb9c3e527351e58b2d /Project/Line.h | |
parent | 93c3c0af32d08bbc22b43a03d81fad37fd8feb19 (diff) | |
download | PSP.git-9e1f6849c929506a17fa12185c5c0185d5287177.tar.gz PSP.git-9e1f6849c929506a17fa12185c5c0185d5287177.tar.xz PSP.git-9e1f6849c929506a17fa12185c5c0185d5287177.zip |
More grid data implemented
Some fault bugfixes
Diffstat (limited to 'Project/Line.h')
-rw-r--r-- | Project/Line.h | 12 |
1 files changed, 6 insertions, 6 deletions
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<double> current[2] = { std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0) }; - std::complex<double> powerFlow[2] = { std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0) }; + std::complex<double> current[2] = {std::complex<double>(0.0, 0.0), std::complex<double>(0.0, 0.0)}; + std::complex<double> powerFlow[2] = {std::complex<double>(0.0, 0.0), std::complex<double>(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<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit); virtual void SetPointList(std::vector<wxPoint2DDouble> pointList); -protected: + protected: void UpdatePowerFlowArrowsPosition(); LineElectricalData m_electricalData; }; -#endif // LINE_H +#endif // LINE_H |