diff options
author | Thales1330 <thaleslima.ufu@gmail.com> | 2016-12-28 20:06:41 -0200 |
---|---|---|
committer | Thales1330 <thaleslima.ufu@gmail.com> | 2016-12-28 20:06:41 -0200 |
commit | fb9de1b7935376897f1c93676ab1faeb1ea25f25 (patch) | |
tree | 51e1c6b989d1072cb07f9152d6efe07353e6768f /Project/Machines.cpp | |
parent | ffed5ee9ae6c11acb5a7afa9fdc33b1047f5d5e9 (diff) | |
download | PSP.git-fb9de1b7935376897f1c93676ab1faeb1ea25f25.tar.gz PSP.git-fb9de1b7935376897f1c93676ab1faeb1ea25f25.tar.xz PSP.git-fb9de1b7935376897f1c93676ab1faeb1ea25f25.zip |
Bus line and transformer copy/paste implemented
Next step is try to generalize. Some graphical implementations in this
commit.
Diffstat (limited to 'Project/Machines.cpp')
-rw-r--r-- | Project/Machines.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Project/Machines.cpp b/Project/Machines.cpp index c24deaf..c1970e6 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. |