summaryrefslogtreecommitdiffstats
path: root/Project/ControlEditor.cpp
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2017-05-03 19:15:52 -0300
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2017-05-03 19:15:52 -0300
commitfb34d58e810ca4d9c886a0d4f9f2ae24cf45dbf9 (patch)
treefdafe78aea92607eec0964dafe65d8f54a8b53fe /Project/ControlEditor.cpp
parent50f31898499d1d1e1ebc8ab9c9c26d3b4ec1b3c1 (diff)
downloadPSP.git-fb34d58e810ca4d9c886a0d4f9f2ae24cf45dbf9.tar.gz
PSP.git-fb34d58e810ca4d9c886a0d4f9f2ae24cf45dbf9.tar.xz
PSP.git-fb34d58e810ca4d9c886a0d4f9f2ae24cf45dbf9.zip
Chart view implemented
Diffstat (limited to 'Project/ControlEditor.cpp')
-rw-r--r--Project/ControlEditor.cpp20
1 files changed, 10 insertions, 10 deletions
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<double> time, x2, x3;
- for(int i=0; i<100; ++i) {
+ std::vector<double> time, sinC, cosC, tgC;
+ for(int i=0; i<360; ++i) {
time.push_back(i);
- x2.push_back(std::pow(static_cast<double>(i),2));
- x3.push_back(std::pow(static_cast<double>(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<ElementPlotData> 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);