From c3b8370a456085dd835349a8c50e7a9e0a117c45 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 25 Apr 2017 19:29:34 -0300 Subject: wxMathPlot implemented on chart view --- Project/ControlEditor.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Project/ControlEditor.cpp') diff --git a/Project/ControlEditor.cpp b/Project/ControlEditor.cpp index e457d0f..927654e 100644 --- a/Project/ControlEditor.cpp +++ b/Project/ControlEditor.cpp @@ -13,6 +13,8 @@ #include "Constant.h" #include "Gain.h" +#include "ChartView.h" + ControlElementButton::ControlElementButton(wxWindow* parent, wxString label, wxImage image, wxWindowID id) : wxWindow(parent, id) { @@ -611,6 +613,14 @@ void ControlEditor::OnKeyDown(wxKeyEvent& event) { RotateSelectedElements(event.GetModifiers() != wxMOD_SHIFT); } break; + case 'L': + { + //tests + if(event.ControlDown() && event.ShiftDown()) { + ChartView* cView = new ChartView(this); + cView->Show(); + } + } } } } -- cgit From 50f31898499d1d1e1ebc8ab9c9c26d3b4ec1b3c1 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Thu, 27 Apr 2017 20:38:55 -0300 Subject: More methods implemented buggy --- Project/ControlEditor.cpp | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'Project/ControlEditor.cpp') diff --git a/Project/ControlEditor.cpp b/Project/ControlEditor.cpp index 927654e..a3ab3d9 100644 --- a/Project/ControlEditor.cpp +++ b/Project/ControlEditor.cpp @@ -14,6 +14,7 @@ #include "Gain.h" #include "ChartView.h" +#include "ElementPlotData.h" ControlElementButton::ControlElementButton(wxWindow* parent, wxString label, wxImage image, wxWindowID id) : wxWindow(parent, id) @@ -617,7 +618,30 @@ void ControlEditor::OnKeyDown(wxKeyEvent& event) { //tests if(event.ControlDown() && event.ShiftDown()) { - ChartView* cView = new ChartView(this); + std::vector time, x2, x3; + for(int i=0; i<100; ++i) { + time.push_back(i); + x2.push_back(std::pow(static_cast(i),2)); + x3.push_back(std::pow(static_cast(i),3)); + } + std::vector epdList; + + ElementPlotData curve1Data(_("Func. polinomiais 1"), ElementPlotData::CT_BUS); + curve1Data.AddData(x2, _("x^2")); + curve1Data.AddData(x3, _("x^3")); + epdList.push_back(curve1Data); + + ElementPlotData curve2Data(_("Func. polinomiais 2"), ElementPlotData::CT_BUS); + curve2Data.AddData(x2, _("x^2")); + curve2Data.AddData(x3, _("x^3")); + epdList.push_back(curve2Data); + + ElementPlotData curve3Data(_("Func. polinomiais 3"), ElementPlotData::CT_SYNC_GENERATOR); + curve3Data.AddData(x2, _("x^2")); + curve3Data.AddData(x3, _("x^3")); + epdList.push_back(curve3Data); + + ChartView* cView = new ChartView(this, epdList, time); cView->Show(); } } -- cgit From fb34d58e810ca4d9c886a0d4f9f2ae24cf45dbf9 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 3 May 2017 19:15:52 -0300 Subject: Chart view implemented --- Project/ControlEditor.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Project/ControlEditor.cpp') diff --git a/Project/ControlEditor.cpp b/Project/ControlEditor.cpp index a3ab3d9..a9d0213 100644 --- a/Project/ControlEditor.cpp +++ b/Project/ControlEditor.cpp @@ -618,27 +618,27 @@ void ControlEditor::OnKeyDown(wxKeyEvent& event) { //tests if(event.ControlDown() && event.ShiftDown()) { - std::vector time, x2, x3; - for(int i=0; i<100; ++i) { + std::vector time, sinC, cosC, tgC; + for(int i=0; i<360; ++i) { time.push_back(i); - x2.push_back(std::pow(static_cast(i),2)); - x3.push_back(std::pow(static_cast(i),3)); + sinC.push_back(std::sin(wxDegToRad(i))); + cosC.push_back(std::cos(wxDegToRad(i))); + tgC.push_back(std::tan(wxDegToRad(i))); } std::vector epdList; ElementPlotData curve1Data(_("Func. polinomiais 1"), ElementPlotData::CT_BUS); - curve1Data.AddData(x2, _("x^2")); - curve1Data.AddData(x3, _("x^3")); + curve1Data.AddData(sinC, _("seno")); epdList.push_back(curve1Data); ElementPlotData curve2Data(_("Func. polinomiais 2"), ElementPlotData::CT_BUS); - curve2Data.AddData(x2, _("x^2")); - curve2Data.AddData(x3, _("x^3")); + curve2Data.AddData(tgC, _("tangente")); epdList.push_back(curve2Data); ElementPlotData curve3Data(_("Func. polinomiais 3"), ElementPlotData::CT_SYNC_GENERATOR); - curve3Data.AddData(x2, _("x^2")); - curve3Data.AddData(x3, _("x^3")); + curve3Data.AddData(sinC, _("seno")); + curve3Data.AddData(cosC, _("cosseno")); + curve3Data.AddData(tgC, _("tangente")); epdList.push_back(curve3Data); ChartView* cView = new ChartView(this, epdList, time); -- cgit