diff --git a/apps/shared/store_controller.cpp b/apps/shared/store_controller.cpp index a2ccdbb8f..cca6b370d 100644 --- a/apps/shared/store_controller.cpp +++ b/apps/shared/store_controller.cpp @@ -243,10 +243,6 @@ int StoreController::numberOfElementsInColumn(int columnIndex) { return m_store->numberOfPairsOfSeries(seriesAtColumn(columnIndex)); } -int StoreController::maxNumberOfElements() const { - return DoublePairStore::k_maxNumberOfPairs; -} - bool StoreController::privateFillColumnWithFormula(Expression formula, ExpressionNode::isVariableTest isVariable) { int currentColumn = selectedColumn(); // Fetch the series used in the formula to compute the size of the filled in series diff --git a/apps/shared/store_controller.h b/apps/shared/store_controller.h index dd877367f..63233f3fa 100644 --- a/apps/shared/store_controller.h +++ b/apps/shared/store_controller.h @@ -79,7 +79,6 @@ protected: bool cellAtLocationIsEditable(int columnIndex, int rowIndex) override; bool setDataAtLocation(double floatBody, int columnIndex, int rowIndex) override; double dataAtLocation(int columnIndex, int rowIndex) override; - int maxNumberOfElements() const override; virtual HighlightCell * titleCells(int index) = 0; int seriesAtColumn(int column) const { return column / DoublePairStore::k_numberOfColumnsPerSeries; } bool privateFillColumnWithFormula(Poincare::Expression formula, Poincare::ExpressionNode::isVariableTest isVariable); @@ -88,6 +87,9 @@ protected: DoublePairStore * m_store; private: int numberOfElementsInColumn(int columnIndex) override; + int maxNumberOfElements() const override { + return DoublePairStore::k_maxNumberOfPairs; + }; ContentView m_contentView; }; diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp index 5efd4e310..c668f0023 100644 --- a/apps/shared/values_controller.cpp +++ b/apps/shared/values_controller.cpp @@ -311,10 +311,6 @@ int ValuesController::numberOfElementsInColumn(int columnIndex) { return m_interval->numberOfElements(); } -int ValuesController::maxNumberOfElements() const { - return Interval::k_maxNumberOfElements; -} - double ValuesController::evaluationOfAbscissaAtColumn(double abscissa, int columnIndex) { ExpiringPointer function = functionStore()->modelForRecord(recordAtColumn(columnIndex)); //TODO LEA RUBEN Careful with merge diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h index 6b1a9aad4..773a4ab7e 100644 --- a/apps/shared/values_controller.h +++ b/apps/shared/values_controller.h @@ -61,7 +61,9 @@ private: bool cellAtLocationIsEditable(int columnIndex, int rowIndex) override; double dataAtLocation(int columnIndex, int rowIndex) override; int numberOfElementsInColumn(int columnIndex) override; - int maxNumberOfElements() const override; + int maxNumberOfElements() const override { + return Interval::k_maxNumberOfElements; + }; virtual double evaluationOfAbscissaAtColumn(double abscissa, int columnIndex); constexpr static int k_maxNumberOfAbscissaCells = 10; virtual int maxNumberOfCells() = 0;