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/*/values_controller] Inline intervalParameterController getter in header

Browse Source 
and make it private
This commit is contained in:
Ruben Dashyan
2019-08-28 16:32:30 +02:00
parent e00a6f7140
commit 5effb5f6b2
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/graph/values/values_controller.cpp
View File

@@ -55,10 +55,6 @@ I18n::Message ValuesController::emptyMessage() {
return I18n::Message::NoActivatedFunction;
}
IntervalParameterController * ValuesController::intervalParameterController() {
return &m_intervalParameterController;
}
Ion::Storage::Record ValuesController::recordAtColumn(int i) {
bool isDerivative = false;
return recordAtColumn(i, &isDerivative);

4
apps/graph/values/values_controller.h
View File

@@ -15,7 +15,6 @@ public:
ValuesController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, Shared::Interval * interval, ButtonRowController * header);
void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
I18n::Message emptyMessage() override;
Shared::IntervalParameterController * intervalParameterController() override;
void updateNumberOfColumns() override;
private:
constexpr static int k_maxNumberOfCells = 50;
@@ -29,6 +28,9 @@ private:
CartesianFunctionStore * functionStore() const override { return static_cast<CartesianFunctionStore *>(Shared::ValuesController::functionStore()); }
Shared::BufferFunctionTitleCell * functionTitleCells(int j) override;
EvenOddBufferTextCell * floatCells(int j) override;
Shared::IntervalParameterController * intervalParameterController() override {
return &m_intervalParameterController;
}
ViewController * functionParameterController() override;
I18n::Message valuesParameterControllerPageTitle() const override;

4
apps/sequence/values/values_controller.cpp
View File

@@ -44,10 +44,6 @@ I18n::Message ValuesController::emptyMessage() {
return I18n::Message::NoActivatedSequence;
}
IntervalParameterController * ValuesController::intervalParameterController() {
return &m_intervalParameterController;
}
bool ValuesController::setDataAtLocation(double floatBody, int columnIndex, int rowIndex) {
if (floatBody < 0) {
return false;

4
apps/sequence/values/values_controller.h
View File

@@ -13,7 +13,6 @@ public:
ValuesController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, Shared::Interval * interval, ButtonRowController * header);
void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
I18n::Message emptyMessage() override;
IntervalParameterController * intervalParameterController() override;
private:
bool setDataAtLocation(double floatBody, int columnIndex, int rowIndex) override;
int maxNumberOfCells() override;
@@ -25,6 +24,9 @@ private:
EvenOddBufferTextCell m_floatCells[k_maxNumberOfCells];
EvenOddBufferTextCell * floatCells(int j) override;
SequenceStore * functionStore() const override { return static_cast<SequenceStore *>(Shared::ValuesController::functionStore()); }
IntervalParameterController * intervalParameterController() override {
return &m_intervalParameterController;
}
ViewController * functionParameterController() override;
I18n::Message valuesParameterControllerPageTitle() const override;
#if COPY_COLUMN

2
apps/shared/values_controller.h
View File

@@ -21,7 +21,6 @@ public:
virtual bool handleEvent(Ion::Events::Event event) override;
void didBecomeFirstResponder() override;
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;
@@ -69,6 +68,7 @@ private:
virtual FunctionTitleCell * functionTitleCells(int j) = 0;
virtual EvenOddBufferTextCell * floatCells(int j) = 0;
EvenOddEditableTextCell m_abscissaCells[k_maxNumberOfAbscissaCells];
virtual IntervalParameterController * intervalParameterController() = 0;
virtual ViewController * functionParameterController() = 0;
virtual I18n::Message valuesParameterControllerPageTitle() const = 0;
ValuesParameterController m_abscissaParameterController;