From d97e18cec6ec681f61cb9882fd67df8152c14709 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 9 Mar 2017 16:40:52 -0300 Subject: Multiplier implementation start --- Project/Multiplier.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Project/Multiplier.cpp (limited to 'Project/Multiplier.cpp') diff --git a/Project/Multiplier.cpp b/Project/Multiplier.cpp new file mode 100644 index 0000000..85916fb --- /dev/null +++ b/Project/Multiplier.cpp @@ -0,0 +1,10 @@ +#include "Multiplier.h" + +Multiplier::Multiplier() : ControlElement() +{ +} + +Multiplier::~Multiplier() +{ +} + -- cgit From 3985018cdb8508b9970646ae4b9886ba4df6dd78 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 24 Mar 2017 19:15:25 -0300 Subject: Multiplier under implementation --- Project/Multiplier.cpp | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'Project/Multiplier.cpp') diff --git a/Project/Multiplier.cpp b/Project/Multiplier.cpp index 85916fb..3bdc418 100644 --- a/Project/Multiplier.cpp +++ b/Project/Multiplier.cpp @@ -2,9 +2,47 @@ Multiplier::Multiplier() : ControlElement() { + m_width = m_height = 36.0; + Node* nodeIn1 = new Node(m_position + wxPoint2DDouble(-m_width / 2, 9 - m_height / 2), Node::NODE_IN, m_borderSize); + nodeIn1->StartMove(m_position); + Node* nodeIn2 = + new Node(m_position + wxPoint2DDouble(-m_width / 2, 27 - m_height / 2), Node::NODE_IN, m_borderSize); + nodeIn2->StartMove(m_position); + Node* nodeOut = new Node(m_position + wxPoint2DDouble(m_width / 2, 0), Node::NODE_OUT, m_borderSize); + nodeOut->SetAngle(180.0); + nodeOut->StartMove(m_position); + m_nodeList.push_back(nodeIn1); + m_nodeList.push_back(nodeIn2); + m_nodeList.push_back(nodeOut); } -Multiplier::~Multiplier() +Multiplier::~Multiplier() {} + +void Multiplier::Draw(wxPoint2DDouble translation, double scale) const { } +bool Multiplier::ShowForm(wxWindow* parent, Element* element) {} + +void Multiplier::Rotate(bool clockwise) +{ + if(clockwise) + m_angle += 90.0; + else + m_angle -= 90.0; + if(m_angle >= 360.0) + m_angle = 0.0; + else if(m_angle < 0) + m_angle = 270.0; + + UpdatePoints(); + + for(auto it = m_nodeList.begin(), itEnd = m_nodeList.end(); it != itEnd; ++it) { + Node* node = *it; + node->Rotate(clockwise); + } +} + +void Multiplier::UpdatePoints() +{ +} -- cgit From 045037ce8f2b106acbe5425245746a2dbed65c26 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 30 Mar 2017 11:10:06 -0300 Subject: Exponencial under implementation --- Project/Multiplier.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) (limited to 'Project/Multiplier.cpp') diff --git a/Project/Multiplier.cpp b/Project/Multiplier.cpp index 3bdc418..2f91eab 100644 --- a/Project/Multiplier.cpp +++ b/Project/Multiplier.cpp @@ -3,12 +3,12 @@ Multiplier::Multiplier() : ControlElement() { m_width = m_height = 36.0; - Node* nodeIn1 = new Node(m_position + wxPoint2DDouble(-m_width / 2, 9 - m_height / 2), Node::NODE_IN, m_borderSize); + Node* nodeIn1 = new Node(m_position + wxPoint2DDouble(-18, -9), Node::NODE_IN, m_borderSize); nodeIn1->StartMove(m_position); Node* nodeIn2 = - new Node(m_position + wxPoint2DDouble(-m_width / 2, 27 - m_height / 2), Node::NODE_IN, m_borderSize); + new Node(m_position + wxPoint2DDouble(-18, 9), Node::NODE_IN, m_borderSize); nodeIn2->StartMove(m_position); - Node* nodeOut = new Node(m_position + wxPoint2DDouble(m_width / 2, 0), Node::NODE_OUT, m_borderSize); + Node* nodeOut = new Node(m_position + wxPoint2DDouble(18, 0), Node::NODE_OUT, m_borderSize); nodeOut->SetAngle(180.0); nodeOut->StartMove(m_position); m_nodeList.push_back(nodeIn1); @@ -20,9 +20,30 @@ Multiplier::~Multiplier() {} void Multiplier::Draw(wxPoint2DDouble translation, double scale) const { -} + glLineWidth(1.0); + if(m_selected) { + glColor4dv(m_selectionColour.GetRGBA()); + double borderSize = (m_borderSize * 2.0 + 1.0) / scale; + DrawRectangle(m_position, m_width + borderSize, m_height + borderSize); + } + glColor4d(1.0, 1.0, 1.0, 1.0); + DrawRectangle(m_position, m_width, m_height); + glColor4d(0.0, 0.0, 0.0, 1.0); + DrawRectangle(m_position, m_width, m_height, GL_LINE_LOOP); + + // Plot x. + glLineWidth(2.0); + std::vector xSymbol; + xSymbol.push_back(m_position + wxPoint2DDouble(-5, -5)); + xSymbol.push_back(m_position + wxPoint2DDouble(5, 5)); + xSymbol.push_back(m_position + wxPoint2DDouble(-5, 5)); + xSymbol.push_back(m_position + wxPoint2DDouble(5, -5)); + glColor4d(0.0, 0.3, 1.0, 1.0); + DrawLine(xSymbol, GL_LINES); -bool Multiplier::ShowForm(wxWindow* parent, Element* element) {} + glColor4d(0.0, 0.0, 0.0, 1.0); + DrawNodes(); +} void Multiplier::Rotate(bool clockwise) { @@ -45,4 +66,21 @@ void Multiplier::Rotate(bool clockwise) void Multiplier::UpdatePoints() { + if(m_angle == 0.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(-18, -9)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(-18, 9)); + m_nodeList[2]->SetPosition(m_position + wxPoint2DDouble(18, 0)); + } else if(m_angle == 90.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(9, -18)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(-9, -18)); + m_nodeList[2]->SetPosition(m_position + wxPoint2DDouble(0, 18)); + } else if(m_angle == 180.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(18, 9)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(18, -9)); + m_nodeList[2]->SetPosition(m_position + wxPoint2DDouble(-18, 0)); + } else if(m_angle == 270.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(-9, 18)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(9, 18)); + m_nodeList[2]->SetPosition(m_position + wxPoint2DDouble(0, -18)); + } } -- cgit From f19803bc64885bcfaef15cfd7a8139c28d3dd506 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 8 Apr 2017 16:31:25 -0300 Subject: Control editor export under implementation File handling --- Project/Multiplier.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Multiplier.cpp') diff --git a/Project/Multiplier.cpp b/Project/Multiplier.cpp index 2f91eab..ee644ed 100644 --- a/Project/Multiplier.cpp +++ b/Project/Multiplier.cpp @@ -1,6 +1,6 @@ #include "Multiplier.h" -Multiplier::Multiplier() : ControlElement() +Multiplier::Multiplier(int id) : ControlElement(id) { m_width = m_height = 36.0; Node* nodeIn1 = new Node(m_position + wxPoint2DDouble(-18, -9), Node::NODE_IN, m_borderSize); -- cgit