From 8fd83716e3d574fbde3b9ea20f6c37f5571b3387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Wed, 12 Oct 2016 11:37:24 +0200 Subject: [PATCH] [apps/graph/values] Add a parameter controller as instance variable in the values controller Change-Id: Id9196e2a4488cf0c39ca6d84f2378f5b445053d0 --- apps/graph/values/values_controller.cpp | 7 ++++++- apps/graph/values/values_controller.h | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp index 062792908..95bb49287 100644 --- a/apps/graph/values/values_controller.cpp +++ b/apps/graph/values/values_controller.cpp @@ -7,7 +7,8 @@ ValuesController::ValuesController(Responder * parentResponder, Graph::FunctionS m_activeCellX(0), m_activeCellY(-1), m_functionStore(functionStore), - m_interval(Graph::Interval(-1.0f, 1.0f, 0.25f)) + m_interval(Graph::Interval(-1.0f, 1.0f, 0.25f)), + m_parameterController(ValuesParameterController(this)) { setButtonTitles("Regler l'intervalle", nullptr, nullptr); } @@ -20,6 +21,10 @@ Responder * ValuesController::tabController() const{ return (parentResponder()->parentResponder()); } +ViewController * ValuesController::parameterController() { + return &m_parameterController; +} + int ValuesController::numberOfRows() { return 1 + m_interval.numberOfElements(); }; diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h index 81f9a835c..7cffa0dc1 100644 --- a/apps/graph/values/values_controller.h +++ b/apps/graph/values/values_controller.h @@ -6,6 +6,7 @@ #include "value_cell.h" #include "title_cell.h" #include "interval.h" +#include "values_parameter_controller.h" class ValuesController : public HeaderViewController, public TableViewDataSource { public: @@ -16,6 +17,7 @@ public: const char * title() const override; bool handleEvent(Ion::Events::Event event) override; void didBecomeFirstResponder() override; + ViewController * parameterController(); int numberOfRows() override; int numberOfColumns() override; @@ -51,6 +53,7 @@ private: int m_activeCellY; Graph::FunctionStore * m_functionStore; Graph::Interval m_interval; + ValuesParameterController m_parameterController; }; #endif