From 25ced2e1582a45dd858105acadca9fb0334a7d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 2 Mar 2017 18:09:41 +0100 Subject: [PATCH] [apps/sequence] Correct go to controller legend: "x"->"n" Change-Id: I47615a5fb23274a54ff1eab7386a570738467e13 --- apps/graph/graph/curve_parameter_controller.cpp | 2 +- apps/sequence/graph/curve_parameter_controller.cpp | 2 +- apps/shared/function_curve_parameter_controller.cpp | 4 ++-- apps/shared/function_curve_parameter_controller.h | 2 +- apps/shared/go_to_parameter_controller.cpp | 4 ++-- apps/shared/go_to_parameter_controller.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/graph/graph/curve_parameter_controller.cpp b/apps/graph/graph/curve_parameter_controller.cpp index bba3c3fd4..10d2f18b4 100644 --- a/apps/graph/graph/curve_parameter_controller.cpp +++ b/apps/graph/graph/curve_parameter_controller.cpp @@ -6,7 +6,7 @@ using namespace Shared; namespace Graph { CurveParameterController::CurveParameterController(InteractiveCurveViewRange * graphRange, BannerView * bannerView, CurveViewCursor * cursor) : - FunctionCurveParameterController(graphRange, cursor), + FunctionCurveParameterController(graphRange, cursor, "x"), m_bannerView(bannerView), m_calculationCell(PointerTableCellWithChevron((char*)"Calculer")), m_derivativeCell(PointerTableCellWithSwitch((char*)"Nombre derivee")) diff --git a/apps/sequence/graph/curve_parameter_controller.cpp b/apps/sequence/graph/curve_parameter_controller.cpp index 4a9173ebb..1a15be626 100644 --- a/apps/sequence/graph/curve_parameter_controller.cpp +++ b/apps/sequence/graph/curve_parameter_controller.cpp @@ -7,7 +7,7 @@ using namespace Shared; namespace Sequence { CurveParameterController::CurveParameterController(GraphController * graphController, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor) : - FunctionCurveParameterController(graphRange, cursor), + FunctionCurveParameterController(graphRange, cursor, "n"), m_sumCell(PointerTableCell((char*)"Somme des termes")), m_graphController(graphController) { diff --git a/apps/shared/function_curve_parameter_controller.cpp b/apps/shared/function_curve_parameter_controller.cpp index f88cdcf5c..1ad9248a1 100644 --- a/apps/shared/function_curve_parameter_controller.cpp +++ b/apps/shared/function_curve_parameter_controller.cpp @@ -3,12 +3,12 @@ namespace Shared { -FunctionCurveParameterController::FunctionCurveParameterController(InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor) : +FunctionCurveParameterController::FunctionCurveParameterController(InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, const char * symbol) : ViewController(nullptr), m_goToCell(PointerTableCellWithChevron((char*)"Aller a")), m_selectableTableView(SelectableTableView(this, this, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), - m_goToParameterController(GoToParameterController(this, graphRange, cursor)), + m_goToParameterController(GoToParameterController(this, graphRange, cursor, symbol)), m_function(nullptr) { } diff --git a/apps/shared/function_curve_parameter_controller.h b/apps/shared/function_curve_parameter_controller.h index 56e8946c8..ce16259c7 100644 --- a/apps/shared/function_curve_parameter_controller.h +++ b/apps/shared/function_curve_parameter_controller.h @@ -11,7 +11,7 @@ namespace Shared { class FunctionCurveParameterController : public ViewController, public SimpleListViewDataSource { public: - FunctionCurveParameterController(InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor); + FunctionCurveParameterController(InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, const char * symbol); View * view() override; void didBecomeFirstResponder() override; KDCoordinate cellHeight() override; diff --git a/apps/shared/go_to_parameter_controller.cpp b/apps/shared/go_to_parameter_controller.cpp index ce4f13fae..02dcf7586 100644 --- a/apps/shared/go_to_parameter_controller.cpp +++ b/apps/shared/go_to_parameter_controller.cpp @@ -4,9 +4,9 @@ namespace Shared { -GoToParameterController::GoToParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor) : +GoToParameterController::GoToParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, const char * symbol) : FloatParameterController(parentResponder), - m_abscisseCell(PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, (char*)"x")), + m_abscisseCell(PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, (char*)symbol)), m_graphRange(graphRange), m_cursor(cursor), m_function(nullptr) diff --git a/apps/shared/go_to_parameter_controller.h b/apps/shared/go_to_parameter_controller.h index 20e956d1e..ae88aebfc 100644 --- a/apps/shared/go_to_parameter_controller.h +++ b/apps/shared/go_to_parameter_controller.h @@ -11,7 +11,7 @@ namespace Shared { class GoToParameterController : public FloatParameterController { public: - GoToParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor); + GoToParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, const char * symbol); const char * title() const override; int numberOfRows() override; HighlightCell * reusableCell(int index) override;