diff --git a/apps/sequence/graph/graph_controller.cpp b/apps/sequence/graph/graph_controller.cpp index d16d68e9d..5db89d5a0 100644 --- a/apps/sequence/graph/graph_controller.cpp +++ b/apps/sequence/graph/graph_controller.cpp @@ -25,18 +25,6 @@ I18n::Message GraphController::emptyMessage() { return I18n::Message::NoActivatedSequence; } -TermSumController * GraphController::termSumController() { - return &m_termSumController; -} - -int GraphController::numberOfCurves() const { - return m_sequenceStore->numberOfModels(); -} - -BannerView * GraphController::bannerView() { - return &m_bannerView; -} - bool GraphController::handleEnter() { m_termSumController.setFunction(m_sequenceStore->activeFunctionAtIndex(indexFunctionSelectedByCursor())); return FunctionGraphController::handleEnter(); @@ -69,20 +57,4 @@ double GraphController::defaultCursorAbscissa() { return std::round(Shared::FunctionGraphController::defaultCursorAbscissa()); } -CurveViewRange * GraphController::interactiveCurveViewRange() { - return m_graphRange; -} - -SequenceStore * GraphController::functionStore() const { - return m_sequenceStore; -} - -GraphView * GraphController::functionGraphView() { - return &m_view; -} - -CurveParameterController * GraphController::curveParameterController() { - return &m_curveParameterController; -} - } diff --git a/apps/sequence/graph/graph_controller.h b/apps/sequence/graph/graph_controller.h index 40e7f70d8..b90942074 100644 --- a/apps/sequence/graph/graph_controller.h +++ b/apps/sequence/graph/graph_controller.h @@ -12,25 +12,25 @@ namespace Sequence { -class GraphController : public Shared::FunctionGraphController { +class GraphController final : public Shared::FunctionGraphController { public: GraphController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, SequenceStore * sequenceStore, CurveViewRange * graphRange, Shared::CurveViewCursor * cursor, int * indexFunctionSelectedByCursor, uint32_t * modelVersion, uint32_t * rangeVersion, Poincare::Preferences::AngleUnit * angleUnitVersion, ButtonRowController * header); I18n::Message emptyMessage() override; - TermSumController * termSumController(); + TermSumController * termSumController() { return &m_termSumController; } protected: - int numberOfCurves() const override; + int numberOfCurves() const override { return m_sequenceStore->numberOfModels(); } private: - BannerView * bannerView() override; + BannerView * bannerView() override { return &m_bannerView; } bool handleEnter() override; bool moveCursorHorizontally(int direction) override; double defaultCursorAbscissa() override; - CurveViewRange * interactiveCurveViewRange() override; - SequenceStore * functionStore() const override; - GraphView * functionGraphView() override; + CurveViewRange * interactiveCurveViewRange() override { return m_graphRange; } + SequenceStore * functionStore() const override { return m_sequenceStore; } + GraphView * functionGraphView() override { return &m_view; } View * cursorView() override { return &m_cursorView; } - CurveParameterController * curveParameterController() override; + CurveParameterController * curveParameterController() override { return &m_curveParameterController; } Shared::CursorView m_cursorView; BannerView m_bannerView; GraphView m_view;