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

Wip copy paste

1 files changed, 7 insertions, 4 deletions

diff --git a/Project/Machines.cpp b/Project/Machines.cpp
index c24deaf..bda8a7a 100644
--- a/Project/Machines.cpp
+++ b/Project/Machines.cpp
@@ -35,12 +35,15 @@ bool Machines::AddParent(Element* parent, wxPoint2DDouble position)
 
 void Machines::Draw(wxPoint2DDouble translation, double scale) const
 {
+    OpenGLColour elementColour;
+    if(m_online) elementColour = m_onlineElementColour;
+    else elementColour = m_offlineElementColour;
+    
     if(m_inserted) {
-
         // Draw Selection (layer 1).
         if(m_selected) {
             glLineWidth(1.5 + m_borderSize * 2.0);
-            glColor4d(0.0, 0.5, 1.0, 0.5);
+            glColor4dv(m_selectionColour.GetRGBA());
             DrawCircle(m_position, 25.0 + (m_borderSize + 1.5) / scale, 20, GL_POLYGON);
             DrawLine(m_pointList);
 
@@ -52,7 +55,7 @@ void Machines::Draw(wxPoint2DDouble translation, double scale) const
         glLineWidth(1.5);
 
         // Draw node.
-        glColor4d(0.2, 0.2, 0.2, 1.0);
+        glColor4dv(elementColour.GetRGBA());
         DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON);
 
         DrawLine(m_pointList);
@@ -63,7 +66,7 @@ void Machines::Draw(wxPoint2DDouble translation, double scale) const
         glColor4d(1.0, 1.0, 1.0, 1.0);
         DrawCircle(m_position, 25.0, 20, GL_POLYGON);
 
-        glColor4d(0.2, 0.2, 0.2, 1.0);
+        glColor4dv(elementColour.GetRGBA());
         DrawCircle(m_position, 25.0, 20);
 
         // Draw machine symbol.