From 47cebfc84d4ae315f4bf8ffb3d074b2b75781a1b Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 5 Sep 2016 00:37:13 -0300 Subject: Capacitor under implementation --- Project/Capacitor.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Project/Capacitor.h (limited to 'Project/Capacitor.h') diff --git a/Project/Capacitor.h b/Project/Capacitor.h new file mode 100644 index 0000000..fe7c267 --- /dev/null +++ b/Project/Capacitor.h @@ -0,0 +1,19 @@ +#ifndef CAPACITOR_H +#define CAPACITOR_H + +#include "Shunt.h" + +class Capacitor : Shunt +{ +public: + Capacitor(); + ~Capacitor(); + + virtual bool AddParent(Element* parent, wxPoint2DDouble position); + virtual void Draw(wxPoint2DDouble translation, double scale) const; + virtual void Rotate(); + virtual bool GetContextMenu(wxMenu& menu); + +}; + +#endif // CAPACITOR_H -- cgit From d93ef357da510f2515556ff2cb51688a4e068805 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Mon, 5 Sep 2016 18:43:50 -0300 Subject: All elements implemented, switches implemented --- Project/Capacitor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Project/Capacitor.h') diff --git a/Project/Capacitor.h b/Project/Capacitor.h index fe7c267..e407ba8 100644 --- a/Project/Capacitor.h +++ b/Project/Capacitor.h @@ -3,7 +3,7 @@ #include "Shunt.h" -class Capacitor : Shunt +class Capacitor : public Shunt { public: Capacitor(); @@ -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/Capacitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Capacitor.h') diff --git a/Project/Capacitor.h b/Project/Capacitor.h index e407ba8..47eff58 100644 --- a/Project/Capacitor.h +++ b/Project/Capacitor.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/Capacitor.h | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'Project/Capacitor.h') diff --git a/Project/Capacitor.h b/Project/Capacitor.h index 47eff58..9a0aad9 100644 --- a/Project/Capacitor.h +++ b/Project/Capacitor.h @@ -3,19 +3,32 @@ #include "Shunt.h" +class ReactiveShuntElementForm; + +struct CapacitorElectricalData { + wxString name; + double reactivePower = 100.0; + ElectricalUnit reactivePowerUnit = UNIT_MVAr; +}; + class Capacitor : public Shunt { -public: - Capacitor(); - ~Capacitor(); - - virtual bool AddParent(Element* parent, wxPoint2DDouble position); + public: + Capacitor(); + Capacitor(wxString name); + ~Capacitor(); + + 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 Intersects(wxRect2DDouble rect) const; virtual void Rotate(bool clockwise = true); virtual bool GetContextMenu(wxMenu& menu); - + virtual bool ShowForm(wxWindow* parent, Element* element); + virtual CapacitorElectricalData GetElectricalData() { return m_electricalData; } + virtual void SetElectricalData(CapacitorElectricalData electricalData) { m_electricalData = electricalData; } + protected: + CapacitorElectricalData m_electricalData; }; -#endif // CAPACITOR_H +#endif // CAPACITOR_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/Capacitor.h | 1 + 1 file changed, 1 insertion(+) (limited to 'Project/Capacitor.h') diff --git a/Project/Capacitor.h b/Project/Capacitor.h index 9a0aad9..248ec6c 100644 --- a/Project/Capacitor.h +++ b/Project/Capacitor.h @@ -26,6 +26,7 @@ class Capacitor : public Shunt virtual bool GetContextMenu(wxMenu& menu); virtual bool ShowForm(wxWindow* parent, Element* element); virtual CapacitorElectricalData GetElectricalData() { return m_electricalData; } + virtual CapacitorElectricalData GetPUElectricalData(double systemPowerBase); virtual void SetElectricalData(CapacitorElectricalData electricalData) { m_electricalData = electricalData; } protected: CapacitorElectricalData m_electricalData; -- cgit