summaryrefslogtreecommitdiffstats
path: root/Project/Capacitor.cpp
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2016-12-29 02:32:50 -0200
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2016-12-29 02:32:50 -0200
commitd792fcf7b2a5862ac86ee69aa86021b5637ca8ee (patch)
treec00bb1d27666ee7d42839efbd420369b2a0d24e3 /Project/Capacitor.cpp
parentfb9de1b7935376897f1c93676ab1faeb1ea25f25 (diff)
downloadPSP.git-d792fcf7b2a5862ac86ee69aa86021b5637ca8ee.tar.gz
PSP.git-d792fcf7b2a5862ac86ee69aa86021b5637ca8ee.tar.xz
PSP.git-d792fcf7b2a5862ac86ee69aa86021b5637ca8ee.zip
Copy paste implemented
Some bugs on the text
Diffstat (limited to 'Project/Capacitor.cpp')
-rw-r--r--Project/Capacitor.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/Project/Capacitor.cpp b/Project/Capacitor.cpp
index 31fecc7..b8d4a7c 100644
--- a/Project/Capacitor.cpp
+++ b/Project/Capacitor.cpp
@@ -36,7 +36,7 @@ bool Capacitor::AddParent(Element* parent, wxPoint2DDouble position)
void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
{
- OpenGLColour* elementColour;
+ OpenGLColour elementColour;
if(m_online) elementColour = m_onlineElementColour;
else elementColour = m_offlineElementColour;
@@ -49,7 +49,7 @@ void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
if(m_selected) {
glLineWidth(1.5 + m_borderSize * 2.0);
- glColor4dv(m_selectionColour->GetRGBA());
+ glColor4dv(m_selectionColour.GetRGBA());
DrawLine(m_pointList);
@@ -69,7 +69,7 @@ void Capacitor::Draw(wxPoint2DDouble translation, double scale) const
}
// Draw Capacitor (layer 2).
glLineWidth(1.5);
- glColor4dv(elementColour->GetRGBA());
+ glColor4dv(elementColour.GetRGBA());
DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON);
DrawLine(m_pointList);
@@ -80,7 +80,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);
- glColor4dv(elementColour->GetRGBA());
+ glColor4dv(elementColour.GetRGBA());
DrawLine(capPts, GL_LINES);
DrawGround(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 10.0));
@@ -153,3 +153,10 @@ CapacitorElectricalData Capacitor::GetPUElectricalData(double systemPowerBase)
return data;
}
+
+Element* Capacitor::GetCopy()
+{
+ Capacitor* copy = new Capacitor();
+ *copy = *this;
+ return copy;
+}