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/ChartViewBase.cpp | 191 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 Project/ChartViewBase.cpp (limited to 'Project/ChartViewBase.cpp') diff --git a/Project/ChartViewBase.cpp b/Project/ChartViewBase.cpp new file mode 100644 index 0000000..2fbec21 --- /dev/null +++ b/Project/ChartViewBase.cpp @@ -0,0 +1,191 @@ +////////////////////////////////////////////////////////////////////// +// This file was auto-generated by codelite's wxCrafter Plugin +// wxCrafter project file: ChartView.wxcp +// Do not modify this file by hand! +////////////////////////////////////////////////////////////////////// + +#include "ChartViewBase.h" + + +// Declare the bitmap loading function +extern void wxCE3EBInitBitmapResources(); + +static bool bBitmapLoaded = false; + + +ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) + : wxFrame(parent, id, title, pos, size, style) +{ + if ( !bBitmapLoaded ) { + // We need to initialise the default bitmap handler + wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); + wxCE3EBInitBitmapResources(); + bBitmapLoaded = true; + } + + m_menuBar = new wxMenuBar(0); + this->SetMenuBar(m_menuBar); + + m_menuFile = new wxMenu(); + m_menuBar->Append(m_menuFile, _("File")); + + m_menuItemSaveImage = new wxMenuItem(m_menuFile, wxID_ANY, _("Save chart as image"), wxT(""), wxITEM_NORMAL); + m_menuFile->Append(m_menuItemSaveImage); + + m_menuItemSandToClipboard = new wxMenuItem(m_menuFile, wxID_ANY, _("Send to clipboard"), wxT(""), wxITEM_NORMAL); + m_menuFile->Append(m_menuItemSandToClipboard); + + m_menuFile->AppendSeparator(); + + m_menuItemExit = new wxMenuItem(m_menuFile, wxID_ANY, _("Exit"), wxT(""), wxITEM_NORMAL); + m_menuFile->Append(m_menuItemExit); + + m_menuView = new wxMenu(); + m_menuBar->Append(m_menuView, _("View")); + + m_menuItemFit = new wxMenuItem(m_menuView, wxID_ANY, _("Fit"), wxT(""), wxITEM_NORMAL); + m_menuView->Append(m_menuItemFit); + + m_menuView->AppendSeparator(); + + m_menuItemShowGrid = new wxMenuItem(m_menuView, wxID_ANY, _("Show grid"), wxT(""), wxITEM_CHECK); + m_menuView->Append(m_menuItemShowGrid); + + m_menuItemShowLabel = new wxMenuItem(m_menuView, wxID_ANY, _("Show label"), wxT(""), wxITEM_CHECK); + m_menuView->Append(m_menuItemShowLabel); + + m_menuItemShowCoordinates = new wxMenuItem(m_menuView, wxID_ANY, _("Show coordinates"), wxT(""), wxITEM_CHECK); + m_menuView->Append(m_menuItemShowCoordinates); + + m_menuItemDarkTheme = new wxMenuItem(m_menuView, wxID_ANY, _("Dark theme"), wxT(""), wxITEM_CHECK); + m_menuView->Append(m_menuItemDarkTheme); + + wxBoxSizer* boxSizer_lvl1_1 = new wxBoxSizer(wxHORIZONTAL); + this->SetSizer(boxSizer_lvl1_1); + + wxBoxSizer* boxSizer_lvl2_1 = new wxBoxSizer(wxVERTICAL); + + boxSizer_lvl1_1->Add(boxSizer_lvl2_1, 0, wxEXPAND, WXC_FROM_DIP(5)); + + m_treeCtrl = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTR_DEFAULT_STYLE); + + boxSizer_lvl2_1->Add(m_treeCtrl, 1, 0, WXC_FROM_DIP(5)); + m_treeCtrl->SetMinSize(wxSize(250,-1)); + + wxArrayString m_pgMgrArr; + wxUnusedVar(m_pgMgrArr); + wxArrayInt m_pgMgrIntArr; + wxUnusedVar(m_pgMgrIntArr); + m_pgMgr = new wxPropertyGridManager(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxPG_SPLITTER_AUTO_CENTER|wxPG_BOLD_MODIFIED); + + boxSizer_lvl2_1->Add(m_pgMgr, 0, 0, WXC_FROM_DIP(5)); + + m_pgPropLineProp = m_pgMgr->Append( new wxPropertyCategory( _("Line properties") ) ); + m_pgPropLineProp->SetHelpString(wxT("")); + + m_pgPropDraw = m_pgMgr->AppendIn( m_pgPropLineProp, new wxBoolProperty( _("Draw"), wxPG_LABEL, 1) ); + m_pgPropDraw->SetHelpString(wxT("")); + m_pgPropDraw->SetEditor( wxT("CheckBox") ); + + m_pgPropColor = m_pgMgr->AppendIn( m_pgPropLineProp, new wxSystemColourProperty( _("Color")) ); + m_pgPropColor->SetValueToUnspecified(); + m_pgPropColor->SetHelpString(wxT("")); + m_pgPropColor->SetEditor( wxT("ChoiceAndButton") ); + + m_pgProplineThick = m_pgMgr->AppendIn( m_pgPropLineProp, new wxIntProperty( _("Thickness"), wxPG_LABEL, 1) ); + m_pgProplineThick->SetHelpString(wxT("")); + m_pgProplineThick->SetEditor( wxT("TextCtrl") ); + + m_pgMgrArr.Clear(); + m_pgMgrIntArr.Clear(); + m_pgMgrArr.Add(_("Solid")); + m_pgMgrArr.Add(_("Dot")); + m_pgMgrArr.Add(_("Dash")); + m_pgMgrArr.Add(_("Dot and dash")); + m_pgMgrArr.Add(_("Cross")); + m_pgMgrArr.Add(_("Diagonal cross")); + m_pgProplineType = m_pgMgr->AppendIn( m_pgPropLineProp, new wxEnumProperty( _("Type"), wxPG_LABEL, m_pgMgrArr, m_pgMgrIntArr, 0) ); + m_pgProplineType->SetHelpString(wxT("")); + m_pgProplineType->SetEditor( wxT("Choice") ); + + m_pgMgrArr.Clear(); + m_pgMgrIntArr.Clear(); + m_pgMgrArr.Add(_("Y")); + m_pgMgrArr.Add(_("X")); + m_pgProplineAxis = m_pgMgr->AppendIn( m_pgPropLineProp, new wxEnumProperty( _("Axis"), wxPG_LABEL, m_pgMgrArr, m_pgMgrIntArr, 0) ); + m_pgProplineAxis->SetHelpString(wxT("")); + m_pgProplineAxis->SetEditor( wxT("Choice") ); + + m_pgPropChartProp = m_pgMgr->Append( new wxPropertyCategory( _("Chart properties") ) ); + m_pgPropChartProp->SetHelpString(wxT("")); + + m_pgPropChartTitle = m_pgMgr->AppendIn( m_pgPropChartProp, new wxStringProperty( _("Chart title"), wxPG_LABEL, wxT("")) ); + m_pgPropChartTitle->SetHelpString(wxT("")); + m_pgPropChartTitle->SetEditor( wxT("TextCtrl") ); + + m_pgPropXLabel = m_pgMgr->AppendIn( m_pgPropChartProp, new wxStringProperty( _("X axis label"), wxPG_LABEL, wxT("")) ); + m_pgPropXLabel->SetHelpString(wxT("")); + m_pgPropXLabel->SetEditor( wxT("TextCtrl") ); + + m_pgPropYLabel = m_pgMgr->AppendIn( m_pgPropChartProp, new wxStringProperty( _("Y axis label"), wxPG_LABEL, wxT("")) ); + m_pgPropYLabel->SetHelpString(wxT("")); + m_pgPropYLabel->SetEditor( wxT("TextCtrl") ); + + m_pgPropMargins = m_pgMgr->AppendIn( m_pgPropChartProp, new wxStringProperty( _("Margins"), wxPG_LABEL, wxT("")) ); + m_pgPropMargins->SetHelpString(wxT("")); + + m_pgPropMarginsUp = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Up"), wxPG_LABEL, 20) ); + m_pgPropMarginsUp->SetHelpString(wxT("")); + + m_pgPropYMarginsBot = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Botton"), wxPG_LABEL, 40) ); + m_pgPropYMarginsBot->SetHelpString(wxT("")); + + m_pgPropYMarginsLeft = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Left"), wxPG_LABEL, 60) ); + m_pgPropYMarginsLeft->SetHelpString(wxT("")); + + m_pgPropYMarginsRight = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Right"), wxPG_LABEL, 10) ); + m_pgPropYMarginsRight->SetHelpString(wxT("")); + + m_pgPropAxisLimit = m_pgMgr->AppendIn( m_pgPropChartProp, new wxStringProperty( _("Axis limit"), wxPG_LABEL, wxT("")) ); + m_pgPropAxisLimit->SetHelpString(wxT("")); + + m_pgPropXMin = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("X min"), wxPG_LABEL, 0) ); + m_pgPropXMin->SetHelpString(wxT("")); + + m_pgPropXMax = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("X max"), wxPG_LABEL, 0) ); + m_pgPropXMax->SetHelpString(wxT("")); + + m_pgPropYMin = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("Y min"), wxPG_LABEL, 0) ); + m_pgPropYMin->SetHelpString(wxT("")); + + m_pgPropYMax = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("Y max"), wxPG_LABEL, 0) ); + m_pgPropYMax->SetHelpString(wxT("")); + m_pgMgr->SetMinSize(wxSize(250,250)); + + m_panelChart = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); + + boxSizer_lvl1_1->Add(m_panelChart, 1, wxEXPAND, WXC_FROM_DIP(5)); + m_panelChart->SetMinSize(wxSize(100,300)); + + SetName(wxT("ChartViewBase")); + SetSize(-1,-1); + if (GetSizer()) { + GetSizer()->Fit(this); + } + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } +#if wxVERSION_NUMBER >= 2900 + if(!wxPersistenceManager::Get().Find(this)) { + wxPersistenceManager::Get().RegisterAndRestore(this); + } else { + wxPersistenceManager::Get().Restore(this); + } +#endif +} + +ChartViewBase::~ChartViewBase() +{ +} -- 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/ChartViewBase.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Project/ChartViewBase.cpp') diff --git a/Project/ChartViewBase.cpp b/Project/ChartViewBase.cpp index 2fbec21..fcb4307 100644 --- a/Project/ChartViewBase.cpp +++ b/Project/ChartViewBase.cpp @@ -87,11 +87,6 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_pgPropDraw->SetHelpString(wxT("")); m_pgPropDraw->SetEditor( wxT("CheckBox") ); - m_pgPropColor = m_pgMgr->AppendIn( m_pgPropLineProp, new wxSystemColourProperty( _("Color")) ); - m_pgPropColor->SetValueToUnspecified(); - m_pgPropColor->SetHelpString(wxT("")); - m_pgPropColor->SetEditor( wxT("ChoiceAndButton") ); - m_pgProplineThick = m_pgMgr->AppendIn( m_pgPropLineProp, new wxIntProperty( _("Thickness"), wxPG_LABEL, 1) ); m_pgProplineThick->SetHelpString(wxT("")); m_pgProplineThick->SetEditor( wxT("TextCtrl") ); @@ -162,11 +157,6 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_pgPropYMax->SetHelpString(wxT("")); m_pgMgr->SetMinSize(wxSize(250,250)); - m_panelChart = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); - - boxSizer_lvl1_1->Add(m_panelChart, 1, wxEXPAND, WXC_FROM_DIP(5)); - m_panelChart->SetMinSize(wxSize(100,300)); - SetName(wxT("ChartViewBase")); SetSize(-1,-1); if (GetSizer()) { @@ -184,8 +174,13 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti wxPersistenceManager::Get().Restore(this); } #endif + // Connect events + m_pgMgr->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); + } ChartViewBase::~ChartViewBase() { + m_pgMgr->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); + } -- 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/ChartViewBase.cpp | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'Project/ChartViewBase.cpp') diff --git a/Project/ChartViewBase.cpp b/Project/ChartViewBase.cpp index fcb4307..22a650b 100644 --- a/Project/ChartViewBase.cpp +++ b/Project/ChartViewBase.cpp @@ -32,8 +32,8 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_menuItemSaveImage = new wxMenuItem(m_menuFile, wxID_ANY, _("Save chart as image"), wxT(""), wxITEM_NORMAL); m_menuFile->Append(m_menuItemSaveImage); - m_menuItemSandToClipboard = new wxMenuItem(m_menuFile, wxID_ANY, _("Send to clipboard"), wxT(""), wxITEM_NORMAL); - m_menuFile->Append(m_menuItemSandToClipboard); + m_menuItemSendToClipboard = new wxMenuItem(m_menuFile, wxID_ANY, _("Send to clipboard"), wxT(""), wxITEM_NORMAL); + m_menuFile->Append(m_menuItemSendToClipboard); m_menuFile->AppendSeparator(); @@ -132,14 +132,14 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_pgPropMarginsUp = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Up"), wxPG_LABEL, 20) ); m_pgPropMarginsUp->SetHelpString(wxT("")); - m_pgPropYMarginsBot = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Botton"), wxPG_LABEL, 40) ); - m_pgPropYMarginsBot->SetHelpString(wxT("")); + m_pgPropMarginsBot = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Botton"), wxPG_LABEL, 40) ); + m_pgPropMarginsBot->SetHelpString(wxT("")); - m_pgPropYMarginsLeft = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Left"), wxPG_LABEL, 60) ); - m_pgPropYMarginsLeft->SetHelpString(wxT("")); + m_pgPropMarginsLeft = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Left"), wxPG_LABEL, 60) ); + m_pgPropMarginsLeft->SetHelpString(wxT("")); - m_pgPropYMarginsRight = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Right"), wxPG_LABEL, 10) ); - m_pgPropYMarginsRight->SetHelpString(wxT("")); + m_pgPropMarginsRight = m_pgMgr->AppendIn( m_pgPropMargins, new wxIntProperty( _("Right"), wxPG_LABEL, 10) ); + m_pgPropMarginsRight->SetHelpString(wxT("")); m_pgPropAxisLimit = m_pgMgr->AppendIn( m_pgPropChartProp, new wxStringProperty( _("Axis limit"), wxPG_LABEL, wxT("")) ); m_pgPropAxisLimit->SetHelpString(wxT("")); @@ -147,13 +147,13 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_pgPropXMin = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("X min"), wxPG_LABEL, 0) ); m_pgPropXMin->SetHelpString(wxT("")); - m_pgPropXMax = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("X max"), wxPG_LABEL, 0) ); + m_pgPropXMax = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("X max"), wxPG_LABEL, 1) ); m_pgPropXMax->SetHelpString(wxT("")); m_pgPropYMin = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("Y min"), wxPG_LABEL, 0) ); m_pgPropYMin->SetHelpString(wxT("")); - m_pgPropYMax = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("Y max"), wxPG_LABEL, 0) ); + m_pgPropYMax = m_pgMgr->AppendIn( m_pgPropAxisLimit, new wxFloatProperty( _("Y max"), wxPG_LABEL, 1) ); m_pgPropYMax->SetHelpString(wxT("")); m_pgMgr->SetMinSize(wxSize(250,250)); @@ -175,12 +175,28 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti } #endif // Connect events + this->Connect(m_menuItemSaveImage->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuSaveImageClick), NULL, this); + this->Connect(m_menuItemSendToClipboard->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuSendClipClick), NULL, this); + this->Connect(m_menuItemExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuExitClick), NULL, this); + this->Connect(m_menuItemFit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuFitClick), NULL, this); + this->Connect(m_menuItemShowGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowGridClick), NULL, this); + this->Connect(m_menuItemShowLabel->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowLabelClick), NULL, this); + this->Connect(m_menuItemShowCoordinates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowCoordinatesClick), NULL, this); + this->Connect(m_menuItemDarkTheme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuDarkThemeClick), NULL, this); m_pgMgr->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); } ChartViewBase::~ChartViewBase() { + this->Disconnect(m_menuItemSaveImage->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuSaveImageClick), NULL, this); + this->Disconnect(m_menuItemSendToClipboard->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuSendClipClick), NULL, this); + this->Disconnect(m_menuItemExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuExitClick), NULL, this); + this->Disconnect(m_menuItemFit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuFitClick), NULL, this); + this->Disconnect(m_menuItemShowGrid->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowGridClick), NULL, this); + this->Disconnect(m_menuItemShowLabel->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowLabelClick), NULL, this); + this->Disconnect(m_menuItemShowCoordinates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowCoordinatesClick), NULL, this); + this->Disconnect(m_menuItemDarkTheme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuDarkThemeClick), NULL, this); m_pgMgr->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); } -- 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/ChartViewBase.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Project/ChartViewBase.cpp') diff --git a/Project/ChartViewBase.cpp b/Project/ChartViewBase.cpp index 22a650b..8c2bc32 100644 --- a/Project/ChartViewBase.cpp +++ b/Project/ChartViewBase.cpp @@ -67,7 +67,7 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti boxSizer_lvl1_1->Add(boxSizer_lvl2_1, 0, wxEXPAND, WXC_FROM_DIP(5)); - m_treeCtrl = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTR_DEFAULT_STYLE); + m_treeCtrl = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTR_DEFAULT_STYLE|wxTR_HIDE_ROOT); boxSizer_lvl2_1->Add(m_treeCtrl, 1, 0, WXC_FROM_DIP(5)); m_treeCtrl->SetMinSize(wxSize(250,-1)); @@ -183,6 +183,8 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti this->Connect(m_menuItemShowLabel->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowLabelClick), NULL, this); this->Connect(m_menuItemShowCoordinates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowCoordinatesClick), NULL, this); this->Connect(m_menuItemDarkTheme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuDarkThemeClick), NULL, this); + m_treeCtrl->Connect(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler(ChartViewBase::OnTreeItemActivated), NULL, this); + m_treeCtrl->Connect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(ChartViewBase::OnTreeItemSelectionChanged), NULL, this); m_pgMgr->Connect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); } @@ -197,6 +199,8 @@ ChartViewBase::~ChartViewBase() this->Disconnect(m_menuItemShowLabel->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowLabelClick), NULL, this); this->Disconnect(m_menuItemShowCoordinates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuShowCoordinatesClick), NULL, this); this->Disconnect(m_menuItemDarkTheme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(ChartViewBase::OnMenuDarkThemeClick), NULL, this); + m_treeCtrl->Disconnect(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler(ChartViewBase::OnTreeItemActivated), NULL, this); + m_treeCtrl->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler(ChartViewBase::OnTreeItemSelectionChanged), NULL, this); m_pgMgr->Disconnect(wxEVT_PG_CHANGED, wxPropertyGridEventHandler(ChartViewBase::OnPropertyGridChange), NULL, this); } -- 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/ChartViewBase.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Project/ChartViewBase.cpp') diff --git a/Project/ChartViewBase.cpp b/Project/ChartViewBase.cpp index 8c2bc32..4b33d5c 100644 --- a/Project/ChartViewBase.cpp +++ b/Project/ChartViewBase.cpp @@ -93,12 +93,6 @@ ChartViewBase::ChartViewBase(wxWindow* parent, wxWindowID id, const wxString& ti m_pgMgrArr.Clear(); m_pgMgrIntArr.Clear(); - m_pgMgrArr.Add(_("Solid")); - m_pgMgrArr.Add(_("Dot")); - m_pgMgrArr.Add(_("Dash")); - m_pgMgrArr.Add(_("Dot and dash")); - m_pgMgrArr.Add(_("Cross")); - m_pgMgrArr.Add(_("Diagonal cross")); m_pgProplineType = m_pgMgr->AppendIn( m_pgPropLineProp, new wxEnumProperty( _("Type"), wxPG_LABEL, m_pgMgrArr, m_pgMgrIntArr, 0) ); m_pgProplineType->SetHelpString(wxT("")); m_pgProplineType->SetEditor( wxT("Choice") ); -- cgit