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/Transformer.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/Transformer.cpp')
-rw-r--r-- | Project/Transformer.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Project/Transformer.cpp b/Project/Transformer.cpp index 42fffaf..4110317 100644 --- a/Project/Transformer.cpp +++ b/Project/Transformer.cpp @@ -92,12 +92,16 @@ bool Transformer::Contains(wxPoint2DDouble position) const void Transformer::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) { // Push the current matrix on stack. glLineWidth(1.5 + m_borderSize * 2.0); - glColor4d(0.0, 0.5, 1.0, 0.5); + glColor4dv(m_selectionColour->GetRGBA()); DrawLine(m_pointList); glPushMatrix(); // Rotate the matrix around the object position. @@ -124,12 +128,12 @@ void Transformer::Draw(wxPoint2DDouble translation, double scale) const // Draw transformer (layer 2). // Transformer line glLineWidth(1.5); - glColor4d(0.2, 0.2, 0.2, 1.0); + glColor4dv(elementColour->GetRGBA()); DrawLine(m_pointList); // Draw nodes. if(m_pointList.size() > 0) { - glColor4d(0.2, 0.2, 0.2, 1.0); + glColor4dv(elementColour->GetRGBA()); DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON); if(m_inserted) { DrawCircle(m_pointList[m_pointList.size() - 1], 5.0, 10, GL_POLYGON); @@ -150,7 +154,7 @@ void Transformer::Draw(wxPoint2DDouble translation, double scale) const DrawCircle(m_rect.GetPosition() + wxPoint2DDouble(20.0, 20.0), 20, 20, GL_POLYGON); DrawCircle(m_rect.GetPosition() + wxPoint2DDouble(50.0, 20.0), 20, 20, GL_POLYGON); - glColor4d(0.2, 0.2, 0.2, 1.0); + glColor4dv(elementColour->GetRGBA()); DrawCircle(m_rect.GetPosition() + wxPoint2DDouble(20.0, 20.0), 20, 20); DrawCircle(m_rect.GetPosition() + wxPoint2DDouble(50.0, 20.0), 20, 20); |