diff options
Diffstat (limited to 'Project/Load.cpp')
| -rw-r--r-- | Project/Load.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Project/Load.cpp b/Project/Load.cpp index d363b17..f5afda3 100644 --- a/Project/Load.cpp +++ b/Project/Load.cpp @@ -40,7 +40,7 @@ bool Load::AddParent(Element* parent, wxPoint2DDouble position) void Load::Draw(wxPoint2DDouble translation, double scale) const { - OpenGLColour* elementColour; + OpenGLColour elementColour; if(m_online) elementColour = m_onlineElementColour; else elementColour = m_offlineElementColour; @@ -48,7 +48,7 @@ void Load::Draw(wxPoint2DDouble translation, double scale) const // Draw Selection (layer 1). if(m_selected) { glLineWidth(1.5 + m_borderSize * 2.0); - glColor4dv(m_selectionColour->GetRGBA()); + glColor4dv(m_selectionColour.GetRGBA()); std::vector<wxPoint2DDouble> selTriangPts; selTriangPts.push_back(m_triangPts[0] + m_position + wxPoint2DDouble(-m_borderSize / scale, -m_borderSize / scale)); @@ -73,7 +73,7 @@ void Load::Draw(wxPoint2DDouble translation, double scale) const glLineWidth(1.5); // Draw node. - glColor4dv(elementColour->GetRGBA()); + glColor4dv(elementColour.GetRGBA()); DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON); DrawLine(m_pointList); @@ -89,7 +89,7 @@ void Load::Draw(wxPoint2DDouble translation, double scale) const glTranslated(m_position.m_x, m_position.m_y, 0.0); 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()); DrawTriangle(triangPts); glPopMatrix(); } @@ -164,3 +164,10 @@ LoadElectricalData Load::GetPUElectricalData(double systemPowerBase) return data; } + +Element* Load::GetCopy() +{ + Load* copy = new Load(); + *copy = *this; + return copy; +} |