Merge pull request #4 from Thales1330/wip/copy-paste

Wip copy paste

1 files changed, 30 insertions, 10 deletions

diff --git a/Project/Capacitor.cpp b/Project/Capacitor.cpp
index 332582d..a4320c9 100644
--- a/Project/Capacitor.cpp
+++ b/Project/Capacitor.cpp
@@ -1,19 +1,26 @@
 #include "ReactiveShuntElementForm.h"
 #include "Capacitor.h"
 
-Capacitor::Capacitor() : Shunt() {}
-Capacitor::Capacitor(wxString name) : Shunt() { m_electricalData.name = name; }
+Capacitor::Capacitor()
+    : Shunt()
+{
+}
+Capacitor::Capacitor(wxString name)
+    : Shunt()
+{
+    m_electricalData.name = name;
+}
 Capacitor::~Capacitor() {}
 bool Capacitor::AddParent(Element* parent, wxPoint2DDouble position)
 {
     if(parent) {
         m_parentList.push_back(parent);
         wxPoint2DDouble parentPt =
-            parent->RotateAtPosition(position, -parent->GetAngle());        // Rotate click to horizontal position.
-        parentPt.m_y = parent->GetPosition().m_y;                           // Centralize on bus.
-        parentPt = parent->RotateAtPosition(parentPt, parent->GetAngle());  // Rotate back.
+            parent->RotateAtPosition(position, -parent->GetAngle());       // Rotate click to horizontal position.
+        parentPt.m_y = parent->GetPosition().m_y;                          // Centralize on bus.
+        parentPt = parent->RotateAtPosition(parentPt, parent->GetAngle()); // Rotate back.
 
-        m_position = parentPt + wxPoint2DDouble(0.0, 100.0);  // Shifts the position to the down of the bus.
+        m_position = parentPt + wxPoint2DDouble(0.0, 100.0); // Shifts the position to the down of the bus.
         m_width = 40;
         m_height = 30;
         m_rect = wxRect2DDouble(m_position.m_x - m_width / 2.0, m_position.m_y - m_height / 2.0, m_width, m_height);
@@ -26,7 +33,7 @@ bool Capacitor::AddParent(Element* parent, wxPoint2DDouble position)
         m_inserted = true;
 
         wxRect2DDouble genRect(0, 0, 0, 0);
-        m_switchRect.push_back(genRect);  // Push a general rectangle.
+        m_switchRect.push_back(genRect); // Push a general rectangle.
         UpdateSwitches();
 
         return true;
@@ -36,6 +43,12 @@ bool Capacitor::AddParent(Element* parent, wxPoint2DDouble position)
 
 void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
 {
+    OpenGLColour elementColour;
+    if(m_online)
+        elementColour = m_onlineElementColour;
+    else
+        elementColour = m_offlineElementColour;
+
     if(m_inserted) {
         std::vector<wxPoint2DDouble> capPts;
         capPts.push_back(wxPoint2DDouble(m_position.m_x - m_width / 2.0, m_position.m_y - m_height / 2.0));
@@ -45,7 +58,7 @@ void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
 
         if(m_selected) {
             glLineWidth(1.5 + m_borderSize * 2.0);
-            glColor4d(0.0, 0.5, 1.0, 0.5);
+            glColor4dv(m_selectionColour.GetRGBA());
 
             DrawLine(m_pointList);
 
@@ -65,7 +78,7 @@ void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
         }
         // Draw Capacitor (layer 2).
         glLineWidth(1.5);
-        glColor4d(0.2, 0.2, 0.2, 1.0);
+        glColor4dv(elementColour.GetRGBA());
         DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON);
         DrawLine(m_pointList);
 
@@ -76,7 +89,7 @@ void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
         glRotated(m_angle, 0.0, 0.0, 1.0);
         glTranslated(-m_position.m_x, -m_position.m_y, 0.0);
 
-        glColor4d(0.2, 0.2, 0.2, 1.0);
+        glColor4dv(elementColour.GetRGBA());
         DrawLine(capPts, GL_LINES);
 
         DrawGround(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 10.0));
@@ -149,3 +162,10 @@ CapacitorElectricalData Capacitor::GetPUElectricalData(double systemPowerBase)
 
     return data;
 }
+
+Element* Capacitor::GetCopy()
+{
+    Capacitor* copy = new Capacitor();
+    *copy = *this;
+    return copy;
+}