From dd0be4471cdb3f44f84f1ec65cabeaa662ae4f30 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Mon, 2 Sep 2019 16:32:05 +0200
Subject: [PATCH] [apps/*/values_controller] Move m_setIntervalButton to
 derived classes

---
 apps/graph/values/values_controller.cpp    |  8 +++++++-
 apps/graph/values/values_controller.h      |  4 ++++
 apps/sequence/values/values_controller.cpp |  8 +++++++-
 apps/sequence/values/values_controller.h   |  4 ++++
 apps/shared/values_controller.cpp          | 12 +-----------
 apps/shared/values_controller.h            |  4 +---
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp
index c9c4f6484..9c1c98b84 100644
--- a/apps/graph/values/values_controller.cpp
+++ b/apps/graph/values/values_controller.cpp
@@ -14,7 +14,13 @@ ValuesController::ValuesController(Responder * parentResponder, InputEventHandle
   m_floatCells{},
   m_functionParameterController(this),
   m_intervalParameterController(this, inputEventHandlerDelegate, m_interval),
-  m_derivativeParameterController(this)
+  m_derivativeParameterController(this),
+  m_setIntervalButton(this, I18n::Message::IntervalSet, Invocation([](void * context, void * sender) {
+    ValuesController * valuesController = (ValuesController *) context;
+    StackViewController * stack = ((StackViewController *)valuesController->stackController());
+    stack->push(valuesController->intervalParameterController());
+    return true;
+  }, this), k_font)
 {
   for (int i = 0; i < k_maxNumberOfFunctions; i++) {
     m_functionTitleCells[i].setOrientation(FunctionTitleCell::Orientation::HorizontalIndicator);
diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h
index ebea49a09..6b592d7ef 100644
--- a/apps/graph/values/values_controller.h
+++ b/apps/graph/values/values_controller.h
@@ -13,6 +13,9 @@ namespace Graph {
 class ValuesController : public Shared::ValuesController {
 public:
   ValuesController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, Shared::Interval * interval, ButtonRowController * header);
+  Button * buttonAtIndex(int index, ButtonRowController::Position position) const override {
+    return const_cast<Button *>(&m_setIntervalButton);
+  }
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
   I18n::Message emptyMessage() override;
   void updateNumberOfColumns() override;
@@ -39,6 +42,7 @@ private:
   FunctionParameterController m_functionParameterController;
   Shared::IntervalParameterController m_intervalParameterController;
   DerivativeParameterController m_derivativeParameterController;
+  Button m_setIntervalButton;
 };
 
 }
diff --git a/apps/sequence/values/values_controller.cpp b/apps/sequence/values/values_controller.cpp
index 6c728cdb3..833913c59 100644
--- a/apps/sequence/values/values_controller.cpp
+++ b/apps/sequence/values/values_controller.cpp
@@ -13,7 +13,13 @@ ValuesController::ValuesController(Responder * parentResponder,InputEventHandler
 #if COPY_COLUMN
   m_sequenceParameterController('n'),
 #endif
-  m_intervalParameterController(this, inputEventHandlerDelegate, m_interval)
+  m_intervalParameterController(this, inputEventHandlerDelegate, m_interval),
+  m_setIntervalButton(this, I18n::Message::IntervalSet, Invocation([](void * context, void * sender) {
+    ValuesController * valuesController = (ValuesController *) context;
+    StackViewController * stack = ((StackViewController *)valuesController->stackController());
+    stack->push(valuesController->intervalParameterController());
+    return true;
+  }, this), k_font)
 {
   for (int i = 0; i < k_maxNumberOfSequences; i++) {
     m_sequenceTitleCells[i].setOrientation(FunctionTitleCell::Orientation::HorizontalIndicator);
diff --git a/apps/sequence/values/values_controller.h b/apps/sequence/values/values_controller.h
index 53ec0a088..263321803 100644
--- a/apps/sequence/values/values_controller.h
+++ b/apps/sequence/values/values_controller.h
@@ -11,6 +11,9 @@ namespace Sequence {
 class ValuesController : public Shared::ValuesController {
 public:
   ValuesController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, Shared::Interval * interval, ButtonRowController * header);
+  Button * buttonAtIndex(int index, ButtonRowController::Position position) const override {
+    return const_cast<Button *>(&m_setIntervalButton);
+  }
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
   I18n::Message emptyMessage() override;
 private:
@@ -33,6 +36,7 @@ private:
   Shared::ValuesFunctionParameterController m_sequenceParameterController;
 #endif
   IntervalParameterController m_intervalParameterController;
+  Button m_setIntervalButton;
 };
 
 }
diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index 74255e8a0..9601a59ca 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -17,13 +17,7 @@ ValuesController::ValuesController(Responder * parentResponder, InputEventHandle
   m_selectableTableView(this),
   m_abscissaTitleCell(),
   m_abscissaCells{},
-  m_abscissaParameterController(this),
-  m_setIntervalButton(this, I18n::Message::IntervalSet, Invocation([](void * context, void * sender) {
-    ValuesController * valuesController = (ValuesController *) context;
-    StackViewController * stack = ((StackViewController *)valuesController->stackController());
-    stack->push(valuesController->intervalParameterController());
-    return true;
-  }, this), k_font)
+  m_abscissaParameterController(this)
 {
   m_selectableTableView.setVerticalCellOverlap(0);
   m_selectableTableView.setTopMargin(k_topMargin);
@@ -122,10 +116,6 @@ int ValuesController::numberOfButtons(ButtonRowController::Position) const {
   return 1;
 }
 
-Button * ValuesController::buttonAtIndex(int index, ButtonRowController::Position position) const {
-  return (Button *)&m_setIntervalButton;
-}
-
 void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {
   willDisplayCellAtLocationWithDisplayMode(cell, i, j, Preferences::sharedPreferences()->displayMode());
   // The cell is not a title cell and not editable
diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h
index 71144d720..946c86798 100644
--- a/apps/shared/values_controller.h
+++ b/apps/shared/values_controller.h
@@ -23,7 +23,6 @@ public:
   void willExitResponderChain(Responder * nextFirstResponder) override;
   virtual IntervalParameterController * intervalParameterController() = 0;
   int numberOfButtons(ButtonRowController::Position) const override;
-  Button * buttonAtIndex(int index, ButtonRowController::Position position) const override;
   virtual void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
   KDCoordinate columnWidth(int i) override;
   KDCoordinate cumulatedWidthFromIndex(int i) override;
@@ -42,6 +41,7 @@ public:
   static constexpr KDCoordinate k_abscissaCellWidth = 100;
   static constexpr KDCoordinate k_ordinateCellWidth = 100;
 protected:
+  static constexpr const KDFont * k_font = KDFont::SmallFont;
   StackViewController * stackController() const;
   bool setDataAtLocation(double floatBody, int columnIndex, int rowIndex) override;
   virtual void updateNumberOfColumns();
@@ -51,7 +51,6 @@ protected:
   int m_numberOfColumns;
   bool m_numberOfColumnsNeedUpdate;
 private:
-  static constexpr const KDFont * k_font = KDFont::SmallFont;
   Responder * tabController() const override;
   SelectableTableView * selectableTableView() override { return &m_selectableTableView; }
   bool cellAtLocationIsEditable(int columnIndex, int rowIndex) override;
@@ -72,7 +71,6 @@ private:
   virtual ViewController * functionParameterController() = 0;
   virtual I18n::Message valuesParameterControllerPageTitle() const = 0;
   ValuesParameterController m_abscissaParameterController;
-  Button m_setIntervalButton;
 };
 
 }