From fb9de1b7935376897f1c93676ab1faeb1ea25f25 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 28 Dec 2016 20:06:41 -0200 Subject: Bus line and transformer copy/paste implemented Next step is try to generalize. Some graphical implementations in this commit. --- Project/Inductor.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Project/Inductor.cpp') diff --git a/Project/Inductor.cpp b/Project/Inductor.cpp index 9c13f15..4a6cf75 100644 --- a/Project/Inductor.cpp +++ b/Project/Inductor.cpp @@ -36,10 +36,14 @@ bool Inductor::AddParent(Element* parent, wxPoint2DDouble position) void Inductor::Draw(wxPoint2DDouble translation, double scale) const { + OpenGLColour* elementColour; + if(m_online) elementColour = m_onlineElementColour; + else elementColour = m_offlineElementColour; + if(m_inserted) { if(m_selected) { glLineWidth(1.5 + m_borderSize * 2.0); - glColor4d(0.0, 0.5, 1.0, 0.5); + glColor4dv(m_selectionColour->GetRGBA()); DrawLine(m_pointList); @@ -61,7 +65,7 @@ void Inductor::Draw(wxPoint2DDouble translation, double scale) const } // Draw Load (layer 2). glLineWidth(1.5); - glColor4d(0.2, 0.2, 0.2, 1.0); + glColor4dv(elementColour->GetRGBA()); DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON); DrawLine(m_pointList); @@ -72,7 +76,7 @@ void Inductor::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); - glColor4d(0.2, 0.2, 0.2, 1.0); + glColor4dv(elementColour->GetRGBA()); DrawArc(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 10.0), 10, 45, 270, 10, GL_LINE_STRIP); DrawArc(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 25.0), 10, 45, 315, 10, GL_LINE_STRIP); DrawArc(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 40.0), 10, 90, 315, 10, GL_LINE_STRIP); -- cgit From d792fcf7b2a5862ac86ee69aa86021b5637ca8ee Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 29 Dec 2016 02:32:50 -0200 Subject: Copy paste implemented Some bugs on the text --- Project/Inductor.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Project/Inductor.cpp') diff --git a/Project/Inductor.cpp b/Project/Inductor.cpp index 4a6cf75..ffce7d9 100644 --- a/Project/Inductor.cpp +++ b/Project/Inductor.cpp @@ -36,14 +36,14 @@ bool Inductor::AddParent(Element* parent, wxPoint2DDouble position) void Inductor::Draw(wxPoint2DDouble translation, double scale) const { - OpenGLColour* elementColour; + OpenGLColour elementColour; if(m_online) elementColour = m_onlineElementColour; else elementColour = m_offlineElementColour; if(m_inserted) { if(m_selected) { glLineWidth(1.5 + m_borderSize * 2.0); - glColor4dv(m_selectionColour->GetRGBA()); + glColor4dv(m_selectionColour.GetRGBA()); DrawLine(m_pointList); @@ -65,7 +65,7 @@ void Inductor::Draw(wxPoint2DDouble translation, double scale) const } // Draw Load (layer 2). glLineWidth(1.5); - glColor4dv(elementColour->GetRGBA()); + glColor4dv(elementColour.GetRGBA()); DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON); DrawLine(m_pointList); @@ -76,7 +76,7 @@ void Inductor::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()); DrawArc(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 10.0), 10, 45, 270, 10, GL_LINE_STRIP); DrawArc(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 25.0), 10, 45, 315, 10, GL_LINE_STRIP); DrawArc(m_position + wxPoint2DDouble(0, -m_height / 2.0 + 40.0), 10, 90, 315, 10, GL_LINE_STRIP); @@ -147,3 +147,10 @@ InductorElectricalData Inductor::GetPUElectricalData(double systemPowerBase) return data; } + +Element* Inductor::GetCopy() +{ + Inductor* copy = new Inductor(); + *copy = *this; + return copy; +} -- cgit From 3750a0691f4975045647f3f70d8215fb1884e6fb Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 29 Dec 2016 14:07:52 -0200 Subject: Text element paste bug corrected --- Project/Inductor.cpp | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) (limited to 'Project/Inductor.cpp') diff --git a/Project/Inductor.cpp b/Project/Inductor.cpp index ffce7d9..b3f80d9 100644 --- a/Project/Inductor.cpp +++ b/Project/Inductor.cpp @@ -1,19 +1,26 @@ #include "ReactiveShuntElementForm.h" #include "Inductor.h" -Inductor::Inductor() : Shunt() {} -Inductor::Inductor(wxString name) : Shunt() { m_electricalData.name = name; } +Inductor::Inductor() + : Shunt() +{ +} +Inductor::Inductor(wxString name) + : Shunt() +{ + m_electricalData.name = name; +} Inductor::~Inductor() {} bool Inductor::AddParent(Element* parent, wxPoint2DDouble position) { if(parent) { m_parentList.push_back(parent); wxPoint2DDouble parentPt = - parent->RotateAtPosition(position, -parent->GetAngle()); // Rotate click to horizontal position. - parentPt.m_y = parent->GetPosition().m_y; // Centralize on bus. - parentPt = parent->RotateAtPosition(parentPt, parent->GetAngle()); // Rotate back. + parent->RotateAtPosition(position, -parent->GetAngle()); // Rotate click to horizontal position. + parentPt.m_y = parent->GetPosition().m_y; // Centralize on bus. + parentPt = parent->RotateAtPosition(parentPt, parent->GetAngle()); // Rotate back. - m_position = parentPt + wxPoint2DDouble(0.0, 100.0); // Shifts the position to the down of the bus. + m_position = parentPt + wxPoint2DDouble(0.0, 100.0); // Shifts the position to the down of the bus. m_width = 20.0; m_height = 70.0; m_rect = wxRect2DDouble(m_position.m_x - m_width / 2.0, m_position.m_y - m_height / 2.0, m_width, m_height); @@ -26,7 +33,7 @@ bool Inductor::AddParent(Element* parent, wxPoint2DDouble position) m_inserted = true; wxRect2DDouble genRect(0, 0, 0, 0); - m_switchRect.push_back(genRect); // Push a general rectangle. + m_switchRect.push_back(genRect); // Push a general rectangle. UpdateSwitches(); return true; @@ -37,9 +44,11 @@ bool Inductor::AddParent(Element* parent, wxPoint2DDouble position) void Inductor::Draw(wxPoint2DDouble translation, double scale) const { OpenGLColour elementColour; - if(m_online) elementColour = m_onlineElementColour; - else elementColour = m_offlineElementColour; - + if(m_online) + elementColour = m_onlineElementColour; + else + elementColour = m_offlineElementColour; + if(m_inserted) { if(m_selected) { glLineWidth(1.5 + m_borderSize * 2.0); @@ -144,13 +153,13 @@ InductorElectricalData Inductor::GetPUElectricalData(double systemPowerBase) default: break; } - + return data; } Element* Inductor::GetCopy() { - Inductor* copy = new Inductor(); - *copy = *this; - return copy; + Inductor* copy = new Inductor(); + *copy = *this; + return copy; } -- cgit