From 726686c9b378f3a727ded52226b13a760cba1e6c Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Sat, 3 Sep 2016 17:09:24 -0300 Subject: Inductor under implementation Ind motor, sync condenser and load implemented --- Project/Inductor.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Project/Inductor.h (limited to 'Project/Inductor.h') diff --git a/Project/Inductor.h b/Project/Inductor.h new file mode 100644 index 0000000..7c6b535 --- /dev/null +++ b/Project/Inductor.h @@ -0,0 +1,18 @@ +#ifndef INDUCTOR_H +#define INDUCTOR_H + +#include "Shunt.h" + +class Inductor : public Shunt +{ +public: + Inductor(); + ~Inductor(); + + virtual bool AddParent(Element* parent, wxPoint2DDouble position); + virtual void Draw(wxPoint2DDouble translation, double scale) const; + virtual void Rotate(); + virtual bool GetContextMenu(wxMenu& menu); +}; + +#endif // INDUCTOR_H -- cgit From c1aad656847602f7e4c7aead048f7465a76838d4 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sun, 4 Sep 2016 00:59:41 -0300 Subject: Inductor implemented --- Project/Inductor.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Project/Inductor.h') diff --git a/Project/Inductor.h b/Project/Inductor.h index 7c6b535..830cab5 100644 --- a/Project/Inductor.h +++ b/Project/Inductor.h @@ -11,6 +11,8 @@ public: virtual bool AddParent(Element* parent, wxPoint2DDouble position); virtual void Draw(wxPoint2DDouble translation, double scale) const; + virtual bool Contains(wxPoint2DDouble position) const; + virtual bool Intersects(wxRect2DDouble rect) const; virtual void Rotate(); virtual bool GetContextMenu(wxMenu& menu); }; -- cgit From 697baaa3cc92e945d2301238dc9bcabffdb465ef Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 6 Sep 2016 18:32:47 -0300 Subject: Counter clockwise rotation implemented --- Project/Inductor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Inductor.h') diff --git a/Project/Inductor.h b/Project/Inductor.h index 830cab5..721d58a 100644 --- a/Project/Inductor.h +++ b/Project/Inductor.h @@ -13,7 +13,7 @@ public: virtual void Draw(wxPoint2DDouble translation, double scale) const; virtual bool Contains(wxPoint2DDouble position) const; virtual bool Intersects(wxRect2DDouble rect) const; - virtual void Rotate(); + virtual void Rotate(bool clockwise = true); virtual bool GetContextMenu(wxMenu& menu); }; -- cgit From 0e3a45462bf8ce31be988679fd380baeecfb1b95 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 25 Oct 2016 17:09:19 -0200 Subject: Capacitor and Inductor forms implemented --- Project/Inductor.h | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'Project/Inductor.h') diff --git a/Project/Inductor.h b/Project/Inductor.h index 721d58a..21134c5 100644 --- a/Project/Inductor.h +++ b/Project/Inductor.h @@ -3,18 +3,32 @@ #include "Shunt.h" +class ReactiveShuntElementForm; + +struct InductorElectricalData { + wxString name; + double reactivePower = 100.0; + ElectricalUnit reactivePowerUnit = UNIT_MVAr; +}; + class Inductor : public Shunt { -public: - Inductor(); - ~Inductor(); - - virtual bool AddParent(Element* parent, wxPoint2DDouble position); + public: + Inductor(); + Inductor(wxString name); + ~Inductor(); + + virtual bool AddParent(Element* parent, wxPoint2DDouble position); virtual void Draw(wxPoint2DDouble translation, double scale) const; - virtual bool Contains(wxPoint2DDouble position) const; - virtual bool Intersects(wxRect2DDouble rect) const; + virtual bool Contains(wxPoint2DDouble position) const; + virtual bool Intersects(wxRect2DDouble rect) const; virtual void Rotate(bool clockwise = true); virtual bool GetContextMenu(wxMenu& menu); + virtual bool ShowForm(wxWindow* parent, Element* element); + virtual InductorElectricalData GetElectricalData() { return m_electricalData; } + virtual void SetElectricalData(InductorElectricalData electricalData) { m_electricalData = electricalData; } + protected: + InductorElectricalData m_electricalData; }; -#endif // INDUCTOR_H +#endif // INDUCTOR_H -- cgit From b306118b2683cf6f264b5f1617c3e0e62a6c9042 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 1 Nov 2016 19:36:24 -0200 Subject: Power flow (gs) under implementation --- Project/Inductor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/Inductor.h') diff --git a/Project/Inductor.h b/Project/Inductor.h index 21134c5..f157d1c 100644 --- a/Project/Inductor.h +++ b/Project/Inductor.h @@ -26,6 +26,7 @@ class Inductor : public Shunt virtual bool GetContextMenu(wxMenu& menu); virtual bool ShowForm(wxWindow* parent, Element* element); virtual InductorElectricalData GetElectricalData() { return m_electricalData; } + virtual InductorElectricalData GetPUElectricalData(double systemPowerBase); virtual void SetElectricalData(InductorElectricalData electricalData) { m_electricalData = electricalData; } protected: InductorElectricalData m_electricalData; -- cgit