diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-09-09 19:13:03 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 19:13:03 -0300 |
| commit | dcb1934ec64c928efdfa561519d2e46a3c3cb0db (patch) | |
| tree | c1bf65c2bd297d44e258067155292d9798f4c8c9 /Project/Line.h | |
| parent | 926af7f34aaf5aebdbac0cbc550ed75647874258 (diff) | |
| parent | 91b9c3f9909955443e74dedb248fc48fa984709b (diff) | |
| download | PSP.git-dcb1934ec64c928efdfa561519d2e46a3c3cb0db.tar.gz PSP.git-dcb1934ec64c928efdfa561519d2e46a3c3cb0db.tar.xz PSP.git-dcb1934ec64c928efdfa561519d2e46a3c3cb0db.zip | |
Merge pull request #34 from Thales1330/wip-datareport
Wip datareport
Diffstat (limited to 'Project/Line.h')
| -rw-r--r-- | Project/Line.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Project/Line.h b/Project/Line.h index 0abcd82..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(); @@ -59,14 +59,15 @@ public: virtual void CalculateBoundaries(wxPoint2DDouble& leftUp, wxPoint2DDouble& rightBottom) const; virtual void SetPowerFlowDirection(PowerFlowDirection pfDirection); virtual bool ShowForm(wxWindow* parent, Element* element); - virtual LineElectricalData GetElectricalData() const { return m_electricaData; } - virtual void SetElectricalData(LineElectricalData electricalData) { m_electricaData = electricalData; } + virtual LineElectricalData GetElectricalData() const { return m_electricalData; } + 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_electricaData; + LineElectricalData m_electricalData; }; -#endif // LINE_H +#endif // LINE_H |