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] functionParameterController() returns a ViewController *

Browse Source
This commit is contained in:
Ruben Dashyan
2019-08-29 10:19:49 +02:00
parent f5e721239b
commit 6bee336349
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,8 @@ EvenOddBufferTextCell * ValuesController::floatCells(int j) {
return &m_floatCells[j];
}
FunctionParameterController * ValuesController::functionParameterController() {
ViewController * ValuesController::functionParameterController() {
m_functionParameterController.setRecord(recordAtColumn(selectedColumn()));
return &m_functionParameterController;
}

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

@@ -30,7 +30,7 @@ private:
CartesianFunctionStore * functionStore() const override { return static_cast<CartesianFunctionStore *>(Shared::ValuesController::functionStore()); }
Shared::BufferFunctionTitleCell * functionTitleCells(int j) override;
EvenOddBufferTextCell * floatCells(int j) override;
FunctionParameterController * functionParameterController() override;
ViewController * functionParameterController() override;
Shared::BufferFunctionTitleCell m_functionTitleCells[k_maxNumberOfFunctions];
EvenOddBufferTextCell m_floatCells[k_maxNumberOfCells];

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

@@ -73,8 +73,9 @@ EvenOddBufferTextCell * ValuesController::floatCells(int j) {
return &m_floatCells[j];
}
Shared::ValuesFunctionParameterController * ValuesController::functionParameterController() {
ViewController * ValuesController::functionParameterController() {
#if COPY_COLUMN
m_sequenceParameterController.setRecord(recordAtColumn(selectedColumn()));
return &m_sequenceParameterController;
#else
return nullptr;

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

@@ -25,10 +25,10 @@ private:
EvenOddBufferTextCell m_floatCells[k_maxNumberOfCells];
EvenOddBufferTextCell * floatCells(int j) override;
SequenceStore * functionStore() const override { return static_cast<SequenceStore *>(Shared::ValuesController::functionStore()); }
ViewController * functionParameterController() override;
#if COPY_COLUMN
Shared::ValuesFunctionParameterController m_sequenceParameterController;
#endif
Shared::ValuesFunctionParameterController * functionParameterController() override;
IntervalParameterController m_intervalParameterController;
};

1
apps/shared/values_controller.cpp
View File

@@ -253,7 +253,6 @@ void ValuesController::configureFunction() {
return;
}
#endif
functionParameterController()->setRecord(recordAtColumn(selectedColumn()));
StackViewController * stack = stackController();
stack->push(functionParameterController());
}

2
apps/shared/values_controller.h
View File

@@ -72,7 +72,7 @@ private:
virtual FunctionTitleCell * functionTitleCells(int j) = 0;
virtual EvenOddBufferTextCell * floatCells(int j) = 0;
EvenOddEditableTextCell m_abscissaCells[k_maxNumberOfAbscissaCells];
virtual ValuesFunctionParameterController * functionParameterController() = 0;
virtual ViewController * functionParameterController() = 0;
ValuesParameterController m_abscissaParameterController;
Button m_setIntervalButton;
};