UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/shared/(values|store)_controller] Inline maxNumberOfElements in header

Browse Source
This commit is contained in:
Ruben Dashyan
2019-08-01 09:48:01 +02:00
parent fa85293467
commit 1da30fb775
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/shared/store_controller.cpp
View File

@@ -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

4
apps/shared/store_controller.h
View File

@@ -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;
};

4
apps/shared/values_controller.cpp
View File

@@ -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> function = functionStore()->modelForRecord(recordAtColumn(columnIndex));
//TODO LEA RUBEN Careful with merge

4
apps/shared/values_controller.h
View File

@@ -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;