diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-04-24 17:39:03 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 17:39:03 -0300 |
| commit | 7804c1bd2c0bd2a5f135c30b20991e8187581cc6 (patch) | |
| tree | 725e524253d6fd714460402194b408cb33b80b3f /Project/Transformer.h | |
| parent | 69131a727782090ffd7cb467f449e8f26d3d2949 (diff) | |
| parent | 9529a6ed44645842adc6f938478acc1dfa17a284 (diff) | |
| download | PSP.git-7804c1bd2c0bd2a5f135c30b20991e8187581cc6.tar.gz PSP.git-7804c1bd2c0bd2a5f135c30b20991e8187581cc6.tar.xz PSP.git-7804c1bd2c0bd2a5f135c30b20991e8187581cc6.zip | |
Merge pull request #28 from Thales1330/wip/generic-controllers
Wip generic controllers. Chart view implementation required, creating new branch....
Diffstat (limited to 'Project/Transformer.h')
| -rw-r--r-- | Project/Transformer.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Project/Transformer.h b/Project/Transformer.h index d557cda..723a5df 100644 --- a/Project/Transformer.h +++ b/Project/Transformer.h @@ -35,10 +35,10 @@ struct TransformerElectricalData { double turnsRatio = 1.0; double phaseShift = 0.0; bool useTransformerPower = 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; @@ -53,12 +53,12 @@ struct TransformerElectricalData { class Transformer : public Branch { - public: +public: Transformer(); Transformer(wxString name); virtual ~Transformer(); - - virtual Element* GetCopy(); + + virtual Element* GetCopy(); virtual bool AddParent(Element* parent, wxPoint2DDouble position); virtual bool Contains(wxPoint2DDouble position) const; virtual void Draw(wxPoint2DDouble translation, double scale) const; @@ -77,9 +77,9 @@ class Transformer : public Branch virtual void SetElectricaData(TransformerElectricalData electricalData) { m_electricalData = electricalData; } virtual void SetNominalVoltage(std::vector<double> nominalVoltage, std::vector<ElectricalUnit> nominalVoltageUnit); - protected: +protected: void UpdatePowerFlowArrowsPosition(); TransformerElectricalData m_electricalData; }; -#endif // TRANSFORMER_H +#endif // TRANSFORMER_H |