From 9154f5ee02766121f7ac8dd756f2e73ae95e1afa Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 24 Apr 2017 20:11:39 -0300 Subject: Chart view implementation start --- Project/ChartView.h | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Project/ChartView.h (limited to 'Project/ChartView.h') diff --git a/Project/ChartView.h b/Project/ChartView.h new file mode 100644 index 0000000..191a264 --- /dev/null +++ b/Project/ChartView.h @@ -0,0 +1,11 @@ +#ifndef CHARTVIEW_H +#define CHARTVIEW_H +#include "ChartViewBase.h" + +class ChartView : public ChartViewBase +{ +public: + ChartView(wxWindow* parent); + virtual ~ChartView(); +}; +#endif // CHARTVIEW_H -- cgit 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/ChartView.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'Project/ChartView.h') diff --git a/Project/ChartView.h b/Project/ChartView.h index 191a264..316aae9 100644 --- a/Project/ChartView.h +++ b/Project/ChartView.h @@ -1,11 +1,26 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H #include "ChartViewBase.h" +#include "wxMathPlot/mathplot.h" + +#include class ChartView : public ChartViewBase { -public: + public: ChartView(wxWindow* parent); virtual ~ChartView(); + + protected: + virtual void OnPropertyGridChange(wxPropertyGridEvent& event); + virtual void SetMPWindow(); + mpWindow* m_mpWindow = NULL; + mpScaleX* m_xaxis = NULL; + mpScaleY* m_yaxis = NULL; + mpText* m_chartTitle = NULL; + mpInfoCoords* m_coords = NULL; + mpInfoLegend* m_leg = NULL; + + wxPGProperty* m_pgPropColor = NULL; }; -#endif // CHARTVIEW_H +#endif // CHARTVIEW_H -- cgit From ee58faacaaaf83293ead87696847b018f9a1281d Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 26 Apr 2017 19:51:45 -0300 Subject: Element plot data class implemented --- Project/ChartView.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'Project/ChartView.h') diff --git a/Project/ChartView.h b/Project/ChartView.h index 316aae9..c586fbb 100644 --- a/Project/ChartView.h +++ b/Project/ChartView.h @@ -10,8 +10,19 @@ class ChartView : public ChartViewBase public: ChartView(wxWindow* parent); virtual ~ChartView(); + + void Fit(); + void UpdatePlot(bool fit = true); protected: + virtual void OnMenuDarkThemeClick(wxCommandEvent& event); + virtual void OnMenuExitClick(wxCommandEvent& event) { Close(); } + virtual void OnMenuFitClick(wxCommandEvent& event) { Fit(); } + virtual void OnMenuSaveImageClick(wxCommandEvent& event); + virtual void OnMenuSendClipClick(wxCommandEvent& event); + virtual void OnMenuShowCoordinatesClick(wxCommandEvent& event); + virtual void OnMenuShowGridClick(wxCommandEvent& event); + virtual void OnMenuShowLabelClick(wxCommandEvent& event); virtual void OnPropertyGridChange(wxPropertyGridEvent& event); virtual void SetMPWindow(); mpWindow* m_mpWindow = NULL; @@ -21,6 +32,11 @@ class ChartView : public ChartViewBase mpInfoCoords* m_coords = NULL; mpInfoLegend* m_leg = NULL; + bool m_hideGrid = false; + bool m_showLeg = false; + bool m_showCoords = false; + bool m_darkTheme = false; + wxPGProperty* m_pgPropColor = NULL; }; #endif // CHARTVIEW_H -- 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/ChartView.h | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'Project/ChartView.h') diff --git a/Project/ChartView.h b/Project/ChartView.h index c586fbb..a219608 100644 --- a/Project/ChartView.h +++ b/Project/ChartView.h @@ -5,16 +5,20 @@ #include +class ElementPlotData; + class ChartView : public ChartViewBase { public: - ChartView(wxWindow* parent); + ChartView(wxWindow* parent, std::vector epdList, std::vector time); virtual ~ChartView(); - + void Fit(); void UpdatePlot(bool fit = true); protected: + virtual void OnTreeItemActivated(wxTreeEvent& event); + virtual void OnTreeItemSelectionChanged(wxTreeEvent& event); virtual void OnMenuDarkThemeClick(wxCommandEvent& event); virtual void OnMenuExitClick(wxCommandEvent& event) { Close(); } virtual void OnMenuFitClick(wxCommandEvent& event) { Fit(); } @@ -25,6 +29,17 @@ class ChartView : public ChartViewBase virtual void OnMenuShowLabelClick(wxCommandEvent& event); virtual void OnPropertyGridChange(wxPropertyGridEvent& event); virtual void SetMPWindow(); + virtual void SetTreectrl(); + virtual void BuildColourList(); + virtual wxColour GetNextColour(); + + wxPGProperty* m_pgPropColor = NULL; + + wxTreeItemId m_treeTimeID; + + std::vector m_epdList; + std::vector m_time; + mpWindow* m_mpWindow = NULL; mpScaleX* m_xaxis = NULL; mpScaleY* m_yaxis = NULL; @@ -37,6 +52,7 @@ class ChartView : public ChartViewBase bool m_showCoords = false; bool m_darkTheme = false; - wxPGProperty* m_pgPropColor = NULL; + std::vector m_colourList; + std::vector::iterator m_itColourList; }; #endif // CHARTVIEW_H -- 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/ChartView.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Project/ChartView.h') diff --git a/Project/ChartView.h b/Project/ChartView.h index a219608..b40a63d 100644 --- a/Project/ChartView.h +++ b/Project/ChartView.h @@ -4,6 +4,10 @@ #include "wxMathPlot/mathplot.h" #include +#include +#include +#include +#include class ElementPlotData; @@ -32,6 +36,8 @@ class ChartView : public ChartViewBase virtual void SetTreectrl(); virtual void BuildColourList(); virtual wxColour GetNextColour(); + virtual wxTreeItemId AllToYAxis(wxTreeItemId root); + virtual wxTreeItemId UpdateAllPlots(wxTreeItemId root); wxPGProperty* m_pgPropColor = NULL; @@ -39,6 +45,7 @@ class ChartView : public ChartViewBase std::vector m_epdList; std::vector m_time; + std::vector m_xAxisValues; mpWindow* m_mpWindow = NULL; mpScaleX* m_xaxis = NULL; -- cgit