summaryrefslogtreecommitdiffstats
path: root/Project/Load.h
diff options
context:
space:
mode:
authorThales1330 <thaleslima.ufu@gmail.com>2016-10-25 17:09:19 -0200
committerThales1330 <thaleslima.ufu@gmail.com>2016-10-25 17:09:19 -0200
commit0e3a45462bf8ce31be988679fd380baeecfb1b95 (patch)
tree9added371f70dd014c4f39a935bf4cd72566c12d /Project/Load.h
parent58cc8933337d4681025f890af78bfddc45c212d0 (diff)
downloadPSP.git-0e3a45462bf8ce31be988679fd380baeecfb1b95.tar.gz
PSP.git-0e3a45462bf8ce31be988679fd380baeecfb1b95.tar.xz
PSP.git-0e3a45462bf8ce31be988679fd380baeecfb1b95.zip
Capacitor and Inductor forms implemented
Diffstat (limited to 'Project/Load.h')
-rw-r--r--Project/Load.h7
1 files changed, 5 insertions, 2 deletions
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: