From bdb0625280d827ba7333b6fc9d6c6534e0720100 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 24 Jan 2017 18:25:17 -0200 Subject: Control editor implementation start --- Project/TransferFunction.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Project/TransferFunction.cpp (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp new file mode 100644 index 0000000..514ca9c --- /dev/null +++ b/Project/TransferFunction.cpp @@ -0,0 +1,10 @@ +#include "TransferFunction.h" + +TransferFunction::TransferFunction() +{ +} + +TransferFunction::~TransferFunction() +{ +} + -- cgit From 9f17be8af02011f04d188ce991921f6eb0ecf792 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 25 Jan 2017 19:45:45 -0200 Subject: Several graphic tools implemented, tf start --- Project/TransferFunction.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 514ca9c..6bb03ae 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -2,9 +2,60 @@ TransferFunction::TransferFunction() { + // Superscript unicode numbers + m_supNumber[0] = L'\u2070'; + m_supNumber[1] = L'\u00B9'; + m_supNumber[2] = L'\u00B2'; + m_supNumber[3] = L'\u00B3'; + m_supNumber[4] = L'\u2074'; + m_supNumber[5] = L'\u2075'; + m_supNumber[6] = L'\u2076'; + m_supNumber[7] = L'\u2077'; + m_supNumber[8] = L'\u2078'; + m_supNumber[9] = L'\u2079'; + + wxString str = ""; + for(int i = 0; i < 10; i++) { + str += "0,1s" + wxString(m_supNumber[i]) + " "; + } + SetText(str, ""); + + m_width = 100; + m_height = 50; + SetPosition(m_position); // Update rect; } -TransferFunction::~TransferFunction() +TransferFunction::~TransferFunction() {} + +void TransferFunction::Draw(wxPoint2DDouble translation, double scale) const { + 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); + + glEnable(GL_TEXTURE_2D); + glColor4d(0.0, 0.0, 0.0, 1.0); + m_glStringNum->bind(); + m_glStringNum->render(m_position.m_x, m_position.m_y); + glDisable(GL_TEXTURE_2D); } +void TransferFunction::SetText(wxString numerator, wxString denominator) +{ + wxFont font(m_fontSize, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); + wxScreenDC dc; + + if(m_glStringNum) { + delete m_glStringNum; + m_glStringNum = NULL; + } + m_glStringNum = new wxGLString(numerator); + m_glStringNum->setFont(font); + m_glStringNum->consolidate(&dc); +} -- cgit From 15df77aa461ecea7344cce5e736ebee9fb943a9b Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 26 Jan 2017 17:11:37 -0200 Subject: Get superscript implemented --- Project/TransferFunction.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 6bb03ae..3175686 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -15,8 +15,8 @@ TransferFunction::TransferFunction() m_supNumber[9] = L'\u2079'; wxString str = ""; - for(int i = 0; i < 10; i++) { - str += "0,1s" + wxString(m_supNumber[i]) + " "; + for(int i = 0; i < 20; i++) { + str += "0,1s" + GetSuperscriptNumber(i) + " "; } SetText(str, ""); @@ -38,7 +38,7 @@ void TransferFunction::Draw(wxPoint2DDouble translation, double scale) const 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); - + glEnable(GL_TEXTURE_2D); glColor4d(0.0, 0.0, 0.0, 1.0); m_glStringNum->bind(); @@ -59,3 +59,16 @@ void TransferFunction::SetText(wxString numerator, wxString denominator) m_glStringNum->setFont(font); m_glStringNum->consolidate(&dc); } + +wxString TransferFunction::GetSuperscriptNumber(int number) +{ + wxString strNumber = wxString::Format("%d", number); + wxString superscriptStr = ""; + for(int i = 0; i < (int)strNumber.length(); ++i) { + wxString digitStr = strNumber[i]; + long digit = 0; + digitStr.ToLong(&digit); + superscriptStr += wxString(m_supNumber[digit]); + } + return superscriptStr; +} -- cgit From 10bb7105946bc0a892a9daf42ec5181ad9994fcf Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 27 Jan 2017 19:57:18 -0200 Subject: several control elements methods implemented Node position buggy --- Project/TransferFunction.cpp | 135 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 126 insertions(+), 9 deletions(-) (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 3175686..b295864 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -14,21 +14,26 @@ TransferFunction::TransferFunction() m_supNumber[8] = L'\u2078'; m_supNumber[9] = L'\u2079'; - wxString str = ""; - for(int i = 0; i < 20; i++) { - str += "0,1s" + GetSuperscriptNumber(i) + " "; - } - SetText(str, ""); + m_numerator.clear(); + m_numerator.push_back(1); + m_denominator.clear(); + m_denominator.push_back(1); + m_denominator.push_back(1); + UpdateTFText(); - m_width = 100; - m_height = 50; - SetPosition(m_position); // Update rect; + Node node1(m_position + wxPoint2DDouble(-m_width / 2, 0), Node::NODE_IN, m_borderSize); + node1.StartMove(m_position); + Node node2(m_position + wxPoint2DDouble(m_width / 2, 0), Node::NODE_OUT, m_borderSize); + node2.StartMove(m_position); + m_nodeList.push_back(node1); + m_nodeList.push_back(node2); } TransferFunction::~TransferFunction() {} void TransferFunction::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; @@ -39,10 +44,19 @@ void TransferFunction::Draw(wxPoint2DDouble translation, double scale) const glColor4d(0.0, 0.0, 0.0, 1.0); DrawRectangle(m_position, m_width, m_height, GL_LINE_LOOP); + std::vector linePts; + linePts.push_back(wxPoint2DDouble(m_position.m_x - m_width / 2 + 5 + m_borderSize, m_position.m_y)); + linePts.push_back(wxPoint2DDouble(m_position.m_x + m_width / 2 - 5 - m_borderSize, m_position.m_y)); + DrawLine(linePts); + + DrawNodes(); + glEnable(GL_TEXTURE_2D); glColor4d(0.0, 0.0, 0.0, 1.0); m_glStringNum->bind(); - m_glStringNum->render(m_position.m_x, m_position.m_y); + m_glStringNum->render(m_position.m_x, m_position.m_y - m_height / 4); + m_glStringDen->bind(); + m_glStringDen->render(m_position.m_x, m_position.m_y + m_height / 4); glDisable(GL_TEXTURE_2D); } @@ -58,6 +72,21 @@ void TransferFunction::SetText(wxString numerator, wxString denominator) m_glStringNum = new wxGLString(numerator); m_glStringNum->setFont(font); m_glStringNum->consolidate(&dc); + + if(m_glStringDen) { + delete m_glStringDen; + m_glStringDen = NULL; + } + m_glStringDen = new wxGLString(denominator); + m_glStringDen->setFont(font); + m_glStringDen->consolidate(&dc); + + double nWidth = m_glStringNum->getWidth() + 5 + m_borderSize; + double dWidth = m_glStringDen->getWidth() + 5 + m_borderSize; + + m_width = nWidth > dWidth ? nWidth : dWidth; + m_height = m_glStringNum->getheight() + m_glStringDen->getheight() + 2 * m_borderSize; + SetPosition(m_position); // Update rect properly. } wxString TransferFunction::GetSuperscriptNumber(int number) @@ -72,3 +101,91 @@ wxString TransferFunction::GetSuperscriptNumber(int number) } return superscriptStr; } + +void TransferFunction::GetTFString(wxString& numerator, wxString& denominator) +{ + numerator = ""; + denominator = ""; + int index = static_cast(m_numerator.size()) - 1; + for(auto it = m_numerator.begin(), itEnd = m_numerator.end(); it != itEnd; ++it) { + double value = *it; + if(value != 0.0) { + wxString signal; + if(index == static_cast(m_numerator.size()) - 1) { + if(value >= 0.0) + signal += ""; + else + signal += "-"; + } else { + if(value >= 0.0) + signal += "+ "; + else + signal += "- "; + } + + if(index == 0) { + numerator += signal + StringFromDouble(std::abs(value), 0); + break; + } else if(index == 1) { + if(value == 1.0) { + numerator += signal + "s"; + } else { + numerator += signal + StringFromDouble(std::abs(value), 0) + "s"; + } + } else { + if(value == 1.0) { + numerator += signal + "s" + GetSuperscriptNumber(index); + } else { + numerator += signal + StringFromDouble(std::abs(value), 0) + "s" + GetSuperscriptNumber(index); + } + } + numerator += " "; + } + --index; + } + + index = static_cast(m_denominator.size()) - 1; + for(auto it = m_denominator.begin(), itEnd = m_denominator.end(); it != itEnd; ++it) { + double value = *it; + if(value != 0.0) { + wxString signal; + if(index == static_cast(m_denominator.size()) - 1) { + if(value >= 0.0) + signal += ""; + else + signal += "-"; + } else { + if(value >= 0.0) + signal += "+ "; + else + signal += "- "; + } + + if(index == 0) { + denominator += signal + StringFromDouble(std::abs(value), 0); + break; + } else if(index == 1) { + if(value == 1.0) { + denominator += signal + "s"; + } else { + denominator += signal + StringFromDouble(std::abs(value), 0) + "s"; + } + } else { + if(value == 1.0) { + denominator += signal + "s" + GetSuperscriptNumber(index); + } else { + denominator += signal + StringFromDouble(std::abs(value), 0) + "s" + GetSuperscriptNumber(index); + } + } + denominator += " "; + } + --index; + } +} + +void TransferFunction::UpdateTFText() +{ + wxString num, den; + GetTFString(num, den); + SetText(num, den); +} -- cgit From 5e7c19ae397164dd718b2593663cee5d1be687cd Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Sat, 28 Jan 2017 14:50:12 -0200 Subject: Node bug fixes, tf form implemented --- Project/TransferFunction.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index b295864..74314a2 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -1,4 +1,5 @@ #include "TransferFunction.h" +#include "TransferFunctionForm.h" TransferFunction::TransferFunction() { @@ -48,7 +49,7 @@ void TransferFunction::Draw(wxPoint2DDouble translation, double scale) const linePts.push_back(wxPoint2DDouble(m_position.m_x - m_width / 2 + 5 + m_borderSize, m_position.m_y)); linePts.push_back(wxPoint2DDouble(m_position.m_x + m_width / 2 - 5 - m_borderSize, m_position.m_y)); DrawLine(linePts); - + DrawNodes(); glEnable(GL_TEXTURE_2D); @@ -188,4 +189,19 @@ void TransferFunction::UpdateTFText() wxString num, den; GetTFString(num, den); SetText(num, den); + if(m_nodeList.size() == 2) { + m_nodeList[0].SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); + m_nodeList[1].SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); + } +} + +bool TransferFunction::ShowForm(wxWindow* parent, Element* element) +{ + TransferFunctionForm* tfForm = new TransferFunctionForm(parent, this); + if(tfForm->ShowModal() == wxID_OK) { + tfForm->Destroy(); + return true; + } + tfForm->Destroy(); + return false; } -- cgit From 4ddc7be64451db873e49169e951532ce8893e359 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 3 Mar 2017 18:50:40 -0300 Subject: More connection line methods implemented --- Project/TransferFunction.cpp | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 74314a2..34d082c 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -22,10 +22,11 @@ TransferFunction::TransferFunction() m_denominator.push_back(1); UpdateTFText(); - Node node1(m_position + wxPoint2DDouble(-m_width / 2, 0), Node::NODE_IN, m_borderSize); - node1.StartMove(m_position); - Node node2(m_position + wxPoint2DDouble(m_width / 2, 0), Node::NODE_OUT, m_borderSize); - node2.StartMove(m_position); + Node* node1 = new Node(m_position + wxPoint2DDouble(-m_width / 2, 0), Node::NODE_IN, m_borderSize); + node1->StartMove(m_position); + Node* node2 = new Node(m_position + wxPoint2DDouble(m_width / 2, 0), Node::NODE_OUT, m_borderSize); + node2->SetAngle(180.0); + node2->StartMove(m_position); m_nodeList.push_back(node1); m_nodeList.push_back(node2); } @@ -190,8 +191,8 @@ void TransferFunction::UpdateTFText() GetTFString(num, den); SetText(num, den); if(m_nodeList.size() == 2) { - m_nodeList[0].SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); - m_nodeList[1].SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); } } @@ -205,3 +206,34 @@ bool TransferFunction::ShowForm(wxWindow* parent, Element* element) tfForm->Destroy(); return false; } + +void TransferFunction::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; + + if(m_angle == 0.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); + } else if(m_angle == 90.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(0, -m_height / 2)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(0, m_height / 2)); + } else if(m_angle == 180.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); + } else if(m_angle == 270.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(0, m_height / 2)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(0, -m_height / 2)); + } + + for(auto it = m_nodeList.begin(), itEnd = m_nodeList.end(); it != itEnd; ++it) { + Node* node = *it; + node->Rotate(clockwise); + } +} -- cgit From d11da00a993f1eeae6a1be50839ac72740e4e27b Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Sat, 4 Mar 2017 17:14:52 -0300 Subject: Delete element implemented --- Project/TransferFunction.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 34d082c..00e8fa2 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -191,8 +191,19 @@ void TransferFunction::UpdateTFText() GetTFString(num, den); SetText(num, den); if(m_nodeList.size() == 2) { - m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); - m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); + if(m_angle == 0.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); + } else if(m_angle == 90.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(0, -m_height / 2)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(0, m_height / 2)); + } else if(m_angle == 180.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(m_width / 2, 0)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(-m_width / 2, 0)); + } else if(m_angle == 270.0) { + m_nodeList[0]->SetPosition(m_position + wxPoint2DDouble(0, m_height / 2)); + m_nodeList[1]->SetPosition(m_position + wxPoint2DDouble(0, -m_height / 2)); + } } } -- 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/TransferFunction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/TransferFunction.cpp') diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 00e8fa2..9c8ffea 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -1,7 +1,7 @@ #include "TransferFunction.h" #include "TransferFunctionForm.h" -TransferFunction::TransferFunction() +TransferFunction::TransferFunction(int id) : ControlElement(id) { // Superscript unicode numbers m_supNumber[0] = L'\u2070'; -- cgit