From ff6d0a64bd0a8ed1f1124af8caa3f6b8bfa6ef59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 3 Jan 2017 09:56:51 +0100 Subject: [PATCH] [apps/graph/grpah] Correct implementation of the default initialisation parameter page Change-Id: If25c5b6fd80a78017386522c693ec6389154faab --- .../graph/initialisation_parameter_controller.cpp | 11 ++++++----- .../graph/graph/initialisation_parameter_controller.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/graph/graph/initialisation_parameter_controller.cpp b/apps/graph/graph/initialisation_parameter_controller.cpp index 6539a52be..4a6804ce5 100644 --- a/apps/graph/graph/initialisation_parameter_controller.cpp +++ b/apps/graph/graph/initialisation_parameter_controller.cpp @@ -10,11 +10,6 @@ InitialisationParameterController::InitialisationParameterController(Responder * Metric::BottomMargin, Metric::LeftMargin)), m_graphWindow(graphWindow) { - m_cells[0].setText("Trigonometrique"); - m_cells[1].setText("Abscisses entieres"); - m_cells[2].setText("Orthonorme"); - m_cells[3].setText("Reglage de base"); - } const char * InitialisationParameterController::title() const { @@ -79,4 +74,10 @@ KDCoordinate InitialisationParameterController::cellHeight() { return 35; } +void InitialisationParameterController::willDisplayCellForIndex(TableViewCell * cell, int index) { + MenuListCell * myCell = (MenuListCell *)cell; + const char * titles[4] = {"Trigonometrique", "Abscisses entieres", "Orthonorme", "Reglage de base"}; + myCell->setText(titles[index]); +} + } diff --git a/apps/graph/graph/initialisation_parameter_controller.h b/apps/graph/graph/initialisation_parameter_controller.h index 9eebe5ed4..9c2b1f488 100644 --- a/apps/graph/graph/initialisation_parameter_controller.h +++ b/apps/graph/graph/initialisation_parameter_controller.h @@ -3,7 +3,6 @@ #include #include "graph_window.h" -#include "graph_view.h" namespace Graph { @@ -18,6 +17,7 @@ public: KDCoordinate cellHeight() override; TableViewCell * reusableCell(int index) override; int reusableCellCount() override; + void willDisplayCellForIndex(TableViewCell * cell, int index) override; private: constexpr static int k_totalNumberOfCells = 4; MenuListCell m_cells[k_totalNumberOfCells];