From 726686c9b378f3a727ded52226b13a760cba1e6c Mon Sep 17 00:00:00 2001
From: Thales1330 <thaleslima.ufu@gmail.com>
Date: Sat, 3 Sep 2016 17:09:24 -0300
Subject: Inductor under implementation

Ind motor, sync condenser and load implemented
---
 Project/Load.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Project/Load.h

(limited to 'Project/Load.h')

diff --git a/Project/Load.h b/Project/Load.h
new file mode 100644
index 0000000..393ff7a
--- /dev/null
+++ b/Project/Load.h
@@ -0,0 +1,21 @@
+#ifndef LOAD_H
+#define LOAD_H
+
+#include "Shunt.h"
+
+class Load : public Shunt
+{
+   public:
+    Load();
+    ~Load();
+
+    virtual bool AddParent(Element* parent, wxPoint2DDouble position);
+    virtual void Draw(wxPoint2DDouble translation, double scale) const;
+    virtual void Rotate();
+    virtual bool GetContextMenu(wxMenu& menu);
+
+   private:
+    std::vector<wxPoint2DDouble> m_triangPts;
+};
+
+#endif  // LOAD_H
-- 
cgit 


From 697baaa3cc92e945d2301238dc9bcabffdb465ef Mon Sep 17 00:00:00 2001
From: Thales1330 <thaleslima.ufu@gmail.com>
Date: Tue, 6 Sep 2016 18:32:47 -0300
Subject: Counter clockwise rotation implemented

---
 Project/Load.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Project/Load.h')

diff --git a/Project/Load.h b/Project/Load.h
index 393ff7a..fcdaa6b 100644
--- a/Project/Load.h
+++ b/Project/Load.h
@@ -11,7 +11,7 @@ class Load : public Shunt
 
     virtual bool AddParent(Element* parent, wxPoint2DDouble position);
     virtual void Draw(wxPoint2DDouble translation, double scale) const;
-    virtual void Rotate();
+    virtual void Rotate(bool clockwise = true);
     virtual bool GetContextMenu(wxMenu& menu);
 
    private:
-- 
cgit 


From 58cc8933337d4681025f890af78bfddc45c212d0 Mon Sep 17 00:00:00 2001
From: Thales1330 <thaleslima.ufu@gmail.com>
Date: Fri, 21 Oct 2016 17:44:27 -0200
Subject: Load form under implementation

---
 Project/Load.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'Project/Load.h')

diff --git a/Project/Load.h b/Project/Load.h
index fcdaa6b..d1c0e04 100644
--- a/Project/Load.h
+++ b/Project/Load.h
@@ -3,6 +3,22 @@
 
 #include "Shunt.h"
 
+enum LoadType
+{
+    CONST_POWER = 0,
+    CONST_IMPEDANCE
+};
+
+struct LoadElectricalData
+{
+    wxString name;
+    double activePower = 100.0;
+    ElectricalUnit activePowerUnit = UNIT_MW;
+    double reactivePower = 0.0;
+    ElectricalUnit reactivePower = UNIT_MVAr;
+    LoadType loadType = CONST_POWER;
+};
+
 class Load : public Shunt
 {
    public:
@@ -13,9 +29,12 @@ class Load : public Shunt
     virtual void Draw(wxPoint2DDouble translation, double scale) const;
     virtual void Rotate(bool clockwise = true);
     virtual bool GetContextMenu(wxMenu& menu);
+    LoadElectricalData GetElectricalData() { return m_electricalData }
+    void SetElectricalData(LoadElectricalData electricalData) { m_electricalData = electricalData; }
 
    private:
     std::vector<wxPoint2DDouble> m_triangPts;
+    LoadElectricalData m_electricalData;
 };
 
 #endif  // LOAD_H
-- 
cgit 


From 0e3a45462bf8ce31be988679fd380baeecfb1b95 Mon Sep 17 00:00:00 2001
From: Thales1330 <thaleslima.ufu@gmail.com>
Date: Tue, 25 Oct 2016 17:09:19 -0200
Subject: Capacitor and Inductor forms implemented

---
 Project/Load.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Project/Load.h')

diff --git a/Project/Load.h b/Project/Load.h
index d1c0e04..489d4b7 100644
--- a/Project/Load.h
+++ b/Project/Load.h
@@ -1,6 +1,7 @@
 #ifndef LOAD_H
 #define LOAD_H
 
+#include "LoadForm.h"
 #include "Shunt.h"
 
 enum LoadType
@@ -15,7 +16,7 @@ struct LoadElectricalData
     double activePower = 100.0;
     ElectricalUnit activePowerUnit = UNIT_MW;
     double reactivePower = 0.0;
-    ElectricalUnit reactivePower = UNIT_MVAr;
+    ElectricalUnit reactivePowerUnit = UNIT_MVAr;
     LoadType loadType = CONST_POWER;
 };
 
@@ -23,13 +24,15 @@ class Load : public Shunt
 {
    public:
     Load();
+    Load(wxString name);
     ~Load();
 
     virtual bool AddParent(Element* parent, wxPoint2DDouble position);
     virtual void Draw(wxPoint2DDouble translation, double scale) const;
     virtual void Rotate(bool clockwise = true);
     virtual bool GetContextMenu(wxMenu& menu);
-    LoadElectricalData GetElectricalData() { return m_electricalData }
+    virtual bool ShowForm(wxWindow* parent, Element* element);
+    LoadElectricalData GetElectricalData() { return m_electricalData; }
     void SetElectricalData(LoadElectricalData electricalData) { m_electricalData = electricalData; }
 
    private:
-- 
cgit 


From b306118b2683cf6f264b5f1617c3e0e62a6c9042 Mon Sep 17 00:00:00 2001
From: Thales1330 <thaleslima.ufu@gmail.com>
Date: Tue, 1 Nov 2016 19:36:24 -0200
Subject: Power flow (gs) under implementation

---
 Project/Load.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Project/Load.h')

diff --git a/Project/Load.h b/Project/Load.h
index 489d4b7..3c6dd48 100644
--- a/Project/Load.h
+++ b/Project/Load.h
@@ -33,6 +33,7 @@ class Load : public Shunt
     virtual bool GetContextMenu(wxMenu& menu);
     virtual bool ShowForm(wxWindow* parent, Element* element);
     LoadElectricalData GetElectricalData() { return m_electricalData; }
+    LoadElectricalData GetPUElectricalData(double systemPowerBase);
     void SetElectricalData(LoadElectricalData electricalData) { m_electricalData = electricalData; }
 
    private:
-- 
cgit