From 61792058d3adfafe840eb8eec3ba0d2ef5d3afa6 Mon Sep 17 00:00:00 2001 From: Hugo Saint-Vignes Date: Mon, 27 Jul 2020 14:06:30 +0200 Subject: [PATCH] [apps/shared] Fix typos for Interval and curve view temporary params Change-Id: I610726ed5966d353397be923b76dd003297940a7 --- .../interactive_curve_view_controller.h | 4 +-- apps/shared/interval.cpp | 2 +- apps/shared/interval.h | 34 +++++++++---------- apps/shared/interval_parameter_controller.cpp | 25 ++++++++------ apps/shared/interval_parameter_controller.h | 1 + apps/shared/range_parameter_controller.cpp | 1 - apps/shared/range_parameter_controller.h | 2 +- 7 files changed, 36 insertions(+), 33 deletions(-) diff --git a/apps/shared/interactive_curve_view_controller.h b/apps/shared/interactive_curve_view_controller.h index 6fbb1ca29..99927b65a 100644 --- a/apps/shared/interactive_curve_view_controller.h +++ b/apps/shared/interactive_curve_view_controller.h @@ -57,9 +57,9 @@ protected: // SimpleInteractiveCurveViewController float cursorBottomMarginRatio() override; - OkView m_okView; + InteractiveCurveViewRange * interactiveRange() { return m_interactiveRange; } - InteractiveCurveViewRange * interactiveRange(){return m_interactiveRange;} + OkView m_okView; private: /* The value 21 is the actual height of the ButtonRow, that is * ButtonRowController::ContentView::k_plainStyleHeight + 1. diff --git a/apps/shared/interval.cpp b/apps/shared/interval.cpp index 501df7e87..1fccb9e81 100644 --- a/apps/shared/interval.cpp +++ b/apps/shared/interval.cpp @@ -47,7 +47,7 @@ void Interval::reset() { void Interval::clear() { m_parameters.setStart(1.0); - m_parameters.setEnd(10.0); + m_parameters.setEnd(0.0); m_parameters.setStep(1.0); m_needCompute = true; } diff --git a/apps/shared/interval.h b/apps/shared/interval.h index 6db4faa68..95c269d68 100644 --- a/apps/shared/interval.h +++ b/apps/shared/interval.h @@ -10,22 +10,22 @@ public: Interval(const Interval&) = delete; int numberOfElements(); void deleteElementAtIndex(int index); - class intervalParameters { - public: - void setStart(double f) { m_start = f; } - void setEnd(double f) { m_end = f; } - void setStep(double f) {m_step = f; } - double start() const { return m_start; } - double end() const { return m_end; } - double step() const { return m_step; } - private: - double m_start; - double m_end; - double m_step; + class IntervalParameters { + public: + void setStart(double f) { m_start = f; } + void setEnd(double f) { m_end = f; } + void setStep(double f) { m_step = f; } + double start() const { return m_start; } + double end() const { return m_end; } + double step() const { return m_step; } + private: + double m_start; + double m_end; + double m_step; }; double element(int i); - intervalParameters * parameters() { return &m_parameters; } - void setParameters(intervalParameters parameters) { m_parameters = parameters; } + IntervalParameters * parameters() { return &m_parameters; } + void setParameters(IntervalParameters parameters) { m_parameters = parameters; } void setElement(int i, double f); void forceRecompute(){ m_needCompute = true;} void reset(); @@ -37,11 +37,11 @@ private: int m_numberOfElements; double m_intervalBuffer[k_maxNumberOfElements]; bool m_needCompute; - intervalParameters m_parameters; + IntervalParameters m_parameters; }; -typedef void (Interval::intervalParameters::*SetterPointer)(double); -typedef double (Interval::intervalParameters::*GetterPointer)() const; +typedef void (Interval::IntervalParameters::*SetterPointer)(double); +typedef double (Interval::IntervalParameters::*GetterPointer)() const; } diff --git a/apps/shared/interval_parameter_controller.cpp b/apps/shared/interval_parameter_controller.cpp index dc34e34d3..2404f4604 100644 --- a/apps/shared/interval_parameter_controller.cpp +++ b/apps/shared/interval_parameter_controller.cpp @@ -2,7 +2,10 @@ namespace Shared { -static Interval::intervalParameters s_tempIntevalParameters; +Interval::IntervalParameters * IntervalParameterController::SharedTempIntervalParameters() { + static Interval::IntervalParameters sTempIntervalParameters; + return &sTempIntervalParameters; +} IntervalParameterController::IntervalParameterController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate) : FloatParameterController(parentResponder), @@ -18,9 +21,9 @@ IntervalParameterController::IntervalParameterController(Responder * parentRespo } } -void IntervalParameterController::setInterval(Interval * interval) { +void IntervalParameterController::setInterval(Interval * interval) { m_interval = interval; - s_tempIntevalParameters = *(*interval).parameters(); + *SharedTempIntervalParameters() = *(interval->parameters()); } const char * IntervalParameterController::title() { @@ -49,8 +52,8 @@ void IntervalParameterController::willDisplayCellForIndex(HighlightCell * cell, } double IntervalParameterController::parameterAtIndex(int index) { - GetterPointer getters[k_totalNumberOfCell] = {&Shared::Interval::intervalParameters::start, &Shared::Interval::intervalParameters::end, &Shared::Interval::intervalParameters::step}; - return (s_tempIntevalParameters.*getters[index])(); + GetterPointer getters[k_totalNumberOfCell] = {&Shared::Interval::IntervalParameters::start, &Shared::Interval::IntervalParameters::end, &Shared::Interval::IntervalParameters::step}; + return (SharedTempIntervalParameters()->*getters[index])(); } bool IntervalParameterController::setParameterAtIndex(int parameterIndex, double f) { @@ -58,18 +61,18 @@ bool IntervalParameterController::setParameterAtIndex(int parameterIndex, double Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue); return false; } - double start = parameterIndex == 0 ? f : s_tempIntevalParameters.start(); - double end = parameterIndex == 1 ? f : s_tempIntevalParameters.end(); + double start = parameterIndex == 0 ? f : SharedTempIntervalParameters()->start(); + double end = parameterIndex == 1 ? f : SharedTempIntervalParameters()->end(); if (start > end) { if (parameterIndex == 1) { Container::activeApp()->displayWarning(I18n::Message::ForbiddenValue); return false; } double g = f+1.0; - s_tempIntevalParameters.setEnd(g); + SharedTempIntervalParameters()->setEnd(g); } - SetterPointer setters[k_totalNumberOfCell] = {&Shared::Interval::intervalParameters::setStart, &Shared::Interval::intervalParameters::setEnd, &Shared::Interval::intervalParameters::setStep}; - (s_tempIntevalParameters.*setters[parameterIndex])(f); + SetterPointer setters[k_totalNumberOfCell] = {&Shared::Interval::IntervalParameters::setStart, &Shared::Interval::IntervalParameters::setEnd, &Shared::Interval::IntervalParameters::setStep}; + (SharedTempIntervalParameters()->*setters[parameterIndex])(f); return true; } @@ -92,7 +95,7 @@ int IntervalParameterController::reusableParameterCellCount(int type) { } void IntervalParameterController::buttonAction() { - m_interval->setParameters(s_tempIntevalParameters); + m_interval->setParameters(*SharedTempIntervalParameters()); m_interval->forceRecompute(); StackViewController * stack = stackController(); stack->pop(); diff --git a/apps/shared/interval_parameter_controller.h b/apps/shared/interval_parameter_controller.h index 05d511c9a..21c689a3a 100644 --- a/apps/shared/interval_parameter_controller.h +++ b/apps/shared/interval_parameter_controller.h @@ -24,6 +24,7 @@ protected: Interval * m_interval; bool handleEvent(Ion::Events::Event event) override; private: + static Interval::IntervalParameters * SharedTempIntervalParameters(); HighlightCell * reusableParameterCell(int index, int type) override; int reusableParameterCellCount(int type) override; double parameterAtIndex(int index) override; diff --git a/apps/shared/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp index b5881b21a..ecfb92b16 100644 --- a/apps/shared/range_parameter_controller.cpp +++ b/apps/shared/range_parameter_controller.cpp @@ -131,5 +131,4 @@ void RangeParameterController::buttonAction() { stack->pop(); } - } diff --git a/apps/shared/range_parameter_controller.h b/apps/shared/range_parameter_controller.h index 8c5a1ae95..a2006f284 100644 --- a/apps/shared/range_parameter_controller.h +++ b/apps/shared/range_parameter_controller.h @@ -36,6 +36,7 @@ private: int reusableParameterCellCount(int type) override; float parameterAtIndex(int index) override; bool setParameterAtIndex(int parameterIndex, float f) override; + void buttonAction() override; constexpr static int k_numberOfEditableTextCell = 2; constexpr static int k_numberOfConvertibleTextCell = 2; constexpr static int k_numberOfTextCell = k_numberOfEditableTextCell+k_numberOfConvertibleTextCell; @@ -44,7 +45,6 @@ private: MessageTableCellWithEditableText m_xRangeCells[k_numberOfEditableTextCell]; MessageTableCellWithConvertibleEditableText m_yRangeCells[k_numberOfConvertibleTextCell]; MessageTableCellWithSwitch m_yAutoCell; - void buttonAction() override; }; }