From 885b00f7c3b238dc395cc46436f07bf0a67a1a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 17 Nov 2016 15:40:19 +0100 Subject: [PATCH] [apps/graph/values] Change name for consistency: values parameter controller -> interval parameter controller Change-Id: Ibdb7248392d7f4fcc6eaf271952e901a333b0d5e --- apps/graph/Makefile | 2 +- .../values/abscissa_parameter_controller.cpp | 8 ++++---- .../values/abscissa_parameter_controller.h | 6 +++--- ...r.cpp => interval_parameter_controller.cpp} | 18 +++++++++--------- ...oller.h => interval_parameter_controller.h} | 9 +++++---- apps/graph/values/values_controller.cpp | 10 +++++----- apps/graph/values/values_controller.h | 6 +++--- 7 files changed, 30 insertions(+), 29 deletions(-) rename apps/graph/values/{values_parameter_controller.cpp => interval_parameter_controller.cpp} (63%) rename apps/graph/values/{values_parameter_controller.h => interval_parameter_controller.h} (72%) diff --git a/apps/graph/Makefile b/apps/graph/Makefile index 8b7f10c24..35a3abce9 100644 --- a/apps/graph/Makefile +++ b/apps/graph/Makefile @@ -18,10 +18,10 @@ app_objs += $(addprefix apps/graph/,\ values/derivative_parameter_controller.o\ values/function_parameter_controller.o\ values/interval.o\ + values/interval_parameter_controller.o\ values/title_cell.o\ values/value_cell.o\ values/values_controller.o\ - values/values_parameter_controller.o\ ) app_images += apps/graph/graph_icon.png diff --git a/apps/graph/values/abscissa_parameter_controller.cpp b/apps/graph/values/abscissa_parameter_controller.cpp index 7bb99cdf4..c004d5580 100644 --- a/apps/graph/values/abscissa_parameter_controller.cpp +++ b/apps/graph/values/abscissa_parameter_controller.cpp @@ -3,14 +3,14 @@ namespace Graph { -AbscissaParameterController::AbscissaParameterController(Responder * parentResponder, ValuesParameterController * valuesParameterController) : +AbscissaParameterController::AbscissaParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController) : ViewController(parentResponder), m_deleteColumn(MenuListCell((char*)"Effacer la colonne")), m_copyColumn(ChevronMenuListCell((char*)"Copier la colonne dans une liste")), m_setInterval(ChevronMenuListCell((char*)"Regler l'intervalle")), m_selectableTableView(SelectableTableView(this, this, Metric::TopMargin, Metric::RightMargin, Metric::BottomMargin, Metric::LeftMargin)), - m_valuesParameterController(valuesParameterController) + m_intervalParameterController(intervalParameterController) { } @@ -32,7 +32,7 @@ bool AbscissaParameterController::handleEvent(Ion::Events::Event event) { switch (m_selectableTableView.selectedRow()) { case 0: { - Interval * interval = m_valuesParameterController->interval(); + Interval * interval = m_intervalParameterController->interval(); interval->setEnd(0.0f); interval->setStep(1.0f); interval->setStart(1.0f); @@ -45,7 +45,7 @@ bool AbscissaParameterController::handleEvent(Ion::Events::Event event) { case 2: { StackViewController * stack = ((StackViewController *)parentResponder()); - stack->push(m_valuesParameterController); + stack->push(m_intervalParameterController); return true; } default: diff --git a/apps/graph/values/abscissa_parameter_controller.h b/apps/graph/values/abscissa_parameter_controller.h index 3868541c8..a76989070 100644 --- a/apps/graph/values/abscissa_parameter_controller.h +++ b/apps/graph/values/abscissa_parameter_controller.h @@ -2,12 +2,12 @@ #define GRAPH_ABSCISSA_PARAM_CONTROLLER_H #include -#include "values_parameter_controller.h" +#include "interval_parameter_controller.h" namespace Graph { class AbscissaParameterController : public ViewController, public SimpleListViewDataSource { public: - AbscissaParameterController(Responder * parentResponder, ValuesParameterController * valuesParameterController); + AbscissaParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController); View * view() override; const char * title() const override; @@ -23,7 +23,7 @@ private: ChevronMenuListCell m_copyColumn; ChevronMenuListCell m_setInterval; SelectableTableView m_selectableTableView; - ValuesParameterController * m_valuesParameterController; + IntervalParameterController * m_intervalParameterController; }; } diff --git a/apps/graph/values/values_parameter_controller.cpp b/apps/graph/values/interval_parameter_controller.cpp similarity index 63% rename from apps/graph/values/values_parameter_controller.cpp rename to apps/graph/values/interval_parameter_controller.cpp index 37271ade6..1d9dbc5d0 100644 --- a/apps/graph/values/values_parameter_controller.cpp +++ b/apps/graph/values/interval_parameter_controller.cpp @@ -1,9 +1,9 @@ -#include "values_parameter_controller.h" +#include "interval_parameter_controller.h" #include namespace Graph { -ValuesParameterController::ValuesParameterController(Responder * parentResponder, Interval * interval) : +IntervalParameterController::IntervalParameterController(Responder * parentResponder, Interval * interval) : FloatParameterController(parentResponder), m_interval(interval), m_intervalStartCell(TextMenuListCell((char*)"X Debut")), @@ -12,15 +12,15 @@ ValuesParameterController::ValuesParameterController(Responder * parentResponder { } -const char * ValuesParameterController::title() const { +const char * IntervalParameterController::title() const { return "Regler l'intervalle"; } -Graph::Interval * ValuesParameterController::interval() { +Graph::Interval * IntervalParameterController::interval() { return m_interval; } -float ValuesParameterController::parameterAtIndex(int index) { +float IntervalParameterController::parameterAtIndex(int index) { switch (index) { case 0: return m_interval->start(); @@ -34,7 +34,7 @@ float ValuesParameterController::parameterAtIndex(int index) { } } -void ValuesParameterController::setParameterAtIndex(int parameterIndex, float f) { +void IntervalParameterController::setParameterAtIndex(int parameterIndex, float f) { switch(parameterIndex) { case 0: m_interval->setStart(f); @@ -50,18 +50,18 @@ void ValuesParameterController::setParameterAtIndex(int parameterIndex, float f) } } -int ValuesParameterController::numberOfRows() { +int IntervalParameterController::numberOfRows() { return k_totalNumberOfCell; }; -TableViewCell * ValuesParameterController::reusableCell(int index) { +TableViewCell * IntervalParameterController::reusableCell(int index) { assert(index >= 0); assert(index < k_totalNumberOfCell); TableViewCell * cells[] = {&m_intervalStartCell, &m_intervalEndCell, &m_intervalStepCell}; return cells[index]; } -int ValuesParameterController::reusableCellCount() { +int IntervalParameterController::reusableCellCount() { return k_totalNumberOfCell; } diff --git a/apps/graph/values/values_parameter_controller.h b/apps/graph/values/interval_parameter_controller.h similarity index 72% rename from apps/graph/values/values_parameter_controller.h rename to apps/graph/values/interval_parameter_controller.h index 01c5c38d9..fc2a44b18 100644 --- a/apps/graph/values/values_parameter_controller.h +++ b/apps/graph/values/interval_parameter_controller.h @@ -1,14 +1,15 @@ -#ifndef GRAPH_VALUES_PARAM_CONTROLLER_H -#define GRAPH_VALUES_PARAM_CONTROLLER_H +#ifndef GRAPH_INTERVAL_PARAM_CONTROLLER_H +#define GRAPH_INTERVAL_PARAM_CONTROLLER_H #include #include "interval.h" #include "../float_parameter_controller.h" namespace Graph { -class ValuesParameterController : public FloatParameterController { + +class IntervalParameterController : public FloatParameterController { public: - ValuesParameterController(Responder * parentResponder, Interval * interval); + IntervalParameterController(Responder * parentResponder, Interval * interval); Interval * interval(); const char * title() const override; int numberOfRows() override; diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp index 80ec232cd..f62b52188 100644 --- a/apps/graph/values/values_controller.cpp +++ b/apps/graph/values/values_controller.cpp @@ -11,14 +11,14 @@ ValuesController::ValuesController(Responder * parentResponder, FunctionStore * HeaderViewDelegate(header), m_selectableTableView(SelectableTableView(this, this, k_topMargin, k_rightMargin, k_bottomMargin, k_leftMargin)), m_functionStore(functionStore), - m_parameterController(ValuesParameterController(this, &m_interval)), - m_abscissaParameterController(AbscissaParameterController(this, &m_parameterController)), + m_intervalParameterController(IntervalParameterController(this, &m_interval)), + m_abscissaParameterController(AbscissaParameterController(this, &m_intervalParameterController)), m_functionParameterController(FunctionParameterController(this)), m_derivativeParameterController(DerivativeParameterController(this)), m_setIntervalButton(Button(this, "Regler l'intervalle",Invocation([](void * context, void * sender) { ValuesController * valuesController = (ValuesController *) context; StackViewController * stack = ((StackViewController *)valuesController->stackController()); - stack->push(valuesController->parameterController()); + stack->push(valuesController->intervalParameterController()); }, this))) { m_interval.setStart(0); @@ -68,8 +68,8 @@ StackViewController * ValuesController::stackController() const { return (StackViewController *)(parentResponder()->parentResponder()->parentResponder()); } -ViewController * ValuesController::parameterController() { - return &m_parameterController; +ViewController * ValuesController::intervalParameterController() { + return &m_intervalParameterController; } int ValuesController::numberOfRows() { diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h index 182c6c8fd..ece2c2819 100644 --- a/apps/graph/values/values_controller.h +++ b/apps/graph/values/values_controller.h @@ -10,7 +10,7 @@ #include "abscissa_parameter_controller.h" #include "derivative_parameter_controller.h" #include "function_parameter_controller.h" -#include "values_parameter_controller.h" +#include "interval_parameter_controller.h" namespace Graph { @@ -28,7 +28,7 @@ public: const char * title() const override; bool handleEvent(Ion::Events::Event event) override; void didBecomeFirstResponder() override; - ViewController * parameterController(); + ViewController * intervalParameterController(); int numberOfButtons() const override; Button * buttonAtIndex(int index) override; @@ -75,7 +75,7 @@ private: ValueCell m_floatCells[k_maxNumberOfCells]; FunctionStore * m_functionStore; Interval m_interval; - ValuesParameterController m_parameterController; + IntervalParameterController m_intervalParameterController; AbscissaParameterController m_abscissaParameterController; FunctionParameterController m_functionParameterController; DerivativeParameterController m_derivativeParameterController;