From fa8b7148f5deafe21ce6b1d5d7e4c1a3cfb08f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 18 Oct 2016 11:40:51 +0200 Subject: [PATCH] [apps/graph/values] add a pointer to the interval parameter page in the abscissa parameter controller Change-Id: I6c0617e9d5c2113239a91ecbfb55aac0fb7662c8 --- apps/graph/values/abscissa_parameter_controller.cpp | 5 +++-- apps/graph/values/abscissa_parameter_controller.h | 4 +++- apps/graph/values/values_controller.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/graph/values/abscissa_parameter_controller.cpp b/apps/graph/values/abscissa_parameter_controller.cpp index d8a3119b9..d2dbc251f 100644 --- a/apps/graph/values/abscissa_parameter_controller.cpp +++ b/apps/graph/values/abscissa_parameter_controller.cpp @@ -3,14 +3,15 @@ namespace Graph { -AbscissaParameterController::AbscissaParameterController(Responder * parentResponder) : +AbscissaParameterController::AbscissaParameterController(Responder * parentResponder, ValuesParameterController * valuesParameterController) : ViewController(parentResponder), m_deleteColumn(ListViewCell((char*)"Effacer la colonne")), m_copyColumn(ListViewCell((char*)"Copier la colonne dans une liste")), m_setInterval(ListViewCell((char*)"Regler l'intervalle")), m_listView(ListView(this,Metric::TopMargin, Metric::RightMargin, Metric::BottomMargin, Metric::LeftMargin)), - m_activeCell(0) + m_activeCell(0), + m_valuesParameterController(valuesParameterController) { } diff --git a/apps/graph/values/abscissa_parameter_controller.h b/apps/graph/values/abscissa_parameter_controller.h index 31cf2cf1f..9555905e4 100644 --- a/apps/graph/values/abscissa_parameter_controller.h +++ b/apps/graph/values/abscissa_parameter_controller.h @@ -2,11 +2,12 @@ #define GRAPH_ABSCISSA_PARAM_CONTROLLER_H #include +#include "values_parameter_controller.h" namespace Graph { class AbscissaParameterController : public ViewController, public ListViewDataSource { public: - AbscissaParameterController(Responder * parentResponder); + AbscissaParameterController(Responder * parentResponder, ValuesParameterController * valuesParameterController); View * view() override; const char * title() const override; @@ -25,6 +26,7 @@ private: ListViewCell m_setInterval; ListView m_listView; int m_activeCell; + ValuesParameterController * m_valuesParameterController; }; } diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp index 73491ee15..2177051e8 100644 --- a/apps/graph/values/values_controller.cpp +++ b/apps/graph/values/values_controller.cpp @@ -12,7 +12,7 @@ ValuesController::ValuesController(Responder * parentResponder, FunctionStore * m_functionStore(functionStore), m_evaluateContext(evaluateContext), m_parameterController(ValuesParameterController(this, &m_interval)), - m_abscissaParameterController(AbscissaParameterController(this)), + m_abscissaParameterController(AbscissaParameterController(this, &m_parameterController)), m_setIntervalButton(Button(this, "Regler l'intervalle",Invocation([](void * context, void * sender) { ValuesController * valuesController = (ValuesController *) context; StackViewController * stack = ((StackViewController *)valuesController->parentResponder());