diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp index 7730a4916..97594a3f2 100644 --- a/apps/graph/values/values_controller.cpp +++ b/apps/graph/values/values_controller.cpp @@ -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; } diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h index 6b55d1e57..8521f8069 100644 --- a/apps/graph/values/values_controller.h +++ b/apps/graph/values/values_controller.h @@ -30,7 +30,7 @@ private: CartesianFunctionStore * functionStore() const override { return static_cast(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]; diff --git a/apps/sequence/values/values_controller.cpp b/apps/sequence/values/values_controller.cpp index 6fee9bd80..3de95ae84 100644 --- a/apps/sequence/values/values_controller.cpp +++ b/apps/sequence/values/values_controller.cpp @@ -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; diff --git a/apps/sequence/values/values_controller.h b/apps/sequence/values/values_controller.h index eb8645ab0..090cec7c1 100644 --- a/apps/sequence/values/values_controller.h +++ b/apps/sequence/values/values_controller.h @@ -25,10 +25,10 @@ private: EvenOddBufferTextCell m_floatCells[k_maxNumberOfCells]; EvenOddBufferTextCell * floatCells(int j) override; SequenceStore * functionStore() const override { return static_cast(Shared::ValuesController::functionStore()); } + ViewController * functionParameterController() override; #if COPY_COLUMN Shared::ValuesFunctionParameterController m_sequenceParameterController; #endif - Shared::ValuesFunctionParameterController * functionParameterController() override; IntervalParameterController m_intervalParameterController; }; diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp index 590837b0e..08b6d1233 100644 --- a/apps/shared/values_controller.cpp +++ b/apps/shared/values_controller.cpp @@ -253,7 +253,6 @@ void ValuesController::configureFunction() { return; } #endif - functionParameterController()->setRecord(recordAtColumn(selectedColumn())); StackViewController * stack = stackController(); stack->push(functionParameterController()); } diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h index 14a93aee5..166389f81 100644 --- a/apps/shared/values_controller.h +++ b/apps/shared/values_controller.h @@ -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; };