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/Exponential.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Project/Exponential.cpp (limited to 'Project/Exponential.cpp') diff --git a/Project/Exponential.cpp b/Project/Exponential.cpp new file mode 100644 index 0000000..8f2239f --- /dev/null +++ b/Project/Exponential.cpp @@ -0,0 +1,10 @@ +#include "Exponential.h" + +Exponential::Exponential() +{ +} + +Exponential::~Exponential() +{ +} + -- cgit From a684d5c9c9dd131060b5a36d7c7844ae197fcfd1 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 31 Mar 2017 18:16:05 -0300 Subject: Exponencial implemented --- Project/Exponential.cpp | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'Project/Exponential.cpp') diff --git a/Project/Exponential.cpp b/Project/Exponential.cpp index 8f2239f..dc18a90 100644 --- a/Project/Exponential.cpp +++ b/Project/Exponential.cpp @@ -2,9 +2,96 @@ Exponential::Exponential() { + m_width = m_height = 36.0; + Node* nodeIn = new Node(m_position + wxPoint2DDouble(-18, 0), Node::NODE_IN, m_borderSize); + nodeIn->StartMove(m_position); + 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(nodeIn); + m_nodeList.push_back(nodeOut); } Exponential::~Exponential() { } +void Exponential::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 symbol. + std::vector axis; + axis.push_back(m_position + wxPoint2DDouble(-13, 13)); + axis.push_back(m_position + wxPoint2DDouble(13, 13)); + axis.push_back(m_position + wxPoint2DDouble(-13, -13)); + axis.push_back(m_position + wxPoint2DDouble(-13, 13)); + DrawLine(axis, GL_LINES); + + glLineWidth(2.0); + std::vector expSymbol; + expSymbol.push_back(m_position + wxPoint2DDouble(-13, 13)); + expSymbol.push_back(m_position + wxPoint2DDouble(-6, 13)); + expSymbol.push_back(m_position + wxPoint2DDouble(2, 12)); + expSymbol.push_back(m_position + wxPoint2DDouble(4, 11)); + expSymbol.push_back(m_position + wxPoint2DDouble(6, 10)); + expSymbol.push_back(m_position + wxPoint2DDouble(8, 7)); + expSymbol.push_back(m_position + wxPoint2DDouble(11, -1)); + expSymbol.push_back(m_position + wxPoint2DDouble(12, -7)); + expSymbol.push_back(m_position + wxPoint2DDouble(13, -13)); + glColor4d(0.0, 0.3, 1.0, 1.0); + DrawLine(expSymbol); + + glColor4d(0.0, 0.0, 0.0, 1.0); + DrawNodes(); +} + +bool Exponential::ShowForm(wxWindow* parent, Element* element) +{ + return false; +} + +void Exponential::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 Exponential::UpdatePoints() +{ + if(m_angle == 0.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(-18, 0)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(18, 0)); + } else if(m_angle == 90.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(0, -18)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(0, 18)); + } else if(m_angle == 180.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(18, 0)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(-18, 0)); + } else if(m_angle == 270.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(0, 18)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(0, -18)); + } +} -- cgit From afb0e6e08d3911b7387799f5c465fd59ca26a484 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 1 Apr 2017 17:43:54 -0300 Subject: Constant implemented Missing: gain and io --- Project/Exponential.cpp | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'Project/Exponential.cpp') diff --git a/Project/Exponential.cpp b/Project/Exponential.cpp index dc18a90..18fef19 100644 --- a/Project/Exponential.cpp +++ b/Project/Exponential.cpp @@ -1,4 +1,5 @@ #include "Exponential.h" +#include "ExponentialForm.h" Exponential::Exponential() { @@ -12,10 +13,7 @@ Exponential::Exponential() m_nodeList.push_back(nodeOut); } -Exponential::~Exponential() -{ -} - +Exponential::~Exponential() {} void Exponential::Draw(wxPoint2DDouble translation, double scale) const { glLineWidth(1.0); @@ -36,7 +34,7 @@ void Exponential::Draw(wxPoint2DDouble translation, double scale) const axis.push_back(m_position + wxPoint2DDouble(-13, -13)); axis.push_back(m_position + wxPoint2DDouble(-13, 13)); DrawLine(axis, GL_LINES); - + glLineWidth(2.0); std::vector expSymbol; expSymbol.push_back(m_position + wxPoint2DDouble(-13, 13)); @@ -57,6 +55,12 @@ void Exponential::Draw(wxPoint2DDouble translation, double scale) const bool Exponential::ShowForm(wxWindow* parent, Element* element) { + ExponentialForm* form = new ExponentialForm(parent, this); + if(form->ShowModal() == wxID_OK) { + form->Destroy(); + return true; + } + form->Destroy(); return false; } @@ -95,3 +99,15 @@ void Exponential::UpdatePoints() m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(0, -18)); } } + +double Exponential::GetValues(double& aValue, double& bValue) +{ + aValue = m_aValue; + bValue = m_bValue; +} + +void Exponential::SetValues(double aValue, double bValue) +{ + m_aValue = aValue; + m_bValue = bValue; +} -- cgit From 38b3e2decff95f5e29ffb6025ee899d108d22f04 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 4 Apr 2017 18:10:12 -0300 Subject: Gain implemented Implement io: https://ideone.com/0HDBVd --- Project/Exponential.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Exponential.cpp') diff --git a/Project/Exponential.cpp b/Project/Exponential.cpp index 18fef19..cb9dfd8 100644 --- a/Project/Exponential.cpp +++ b/Project/Exponential.cpp @@ -100,7 +100,7 @@ void Exponential::UpdatePoints() } } -double Exponential::GetValues(double& aValue, double& bValue) +void Exponential::GetValues(double& aValue, double& bValue) { aValue = m_aValue; bValue = m_bValue; -- 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/Exponential.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/Exponential.cpp') diff --git a/Project/Exponential.cpp b/Project/Exponential.cpp index cb9dfd8..7c4f1fe 100644 --- a/Project/Exponential.cpp +++ b/Project/Exponential.cpp @@ -1,7 +1,7 @@ #include "Exponential.h" #include "ExponentialForm.h" -Exponential::Exponential() +Exponential::Exponential(int id) : ControlElement(id) { m_width = m_height = 36.0; Node* nodeIn = new Node(m_position + wxPoint2DDouble(-18, 0), Node::NODE_IN, m_borderSize); -- cgit