diff --git a/apps/graph/values/storage_derivative_parameter_controller.cpp b/apps/graph/values/storage_derivative_parameter_controller.cpp index 067033b61..a3fcf9ddd 100644 --- a/apps/graph/values/storage_derivative_parameter_controller.cpp +++ b/apps/graph/values/storage_derivative_parameter_controller.cpp @@ -17,8 +17,11 @@ StorageDerivativeParameterController::StorageDerivativeParameterController(Stora { } -const char * StorageDerivativeParameterController::title() { +void StorageDerivativeParameterController::viewWillAppear() { functionStore()->modelForRecord(m_record)->derivativeNameWithArgument(m_pageTitle, k_maxNumberOfCharsInTitle, StorageCartesianFunctionStore::Symbol()); +} + +const char * StorageDerivativeParameterController::title() { return m_pageTitle; } diff --git a/apps/graph/values/storage_derivative_parameter_controller.h b/apps/graph/values/storage_derivative_parameter_controller.h index f1a2b4b87..30675d06a 100644 --- a/apps/graph/values/storage_derivative_parameter_controller.h +++ b/apps/graph/values/storage_derivative_parameter_controller.h @@ -15,6 +15,7 @@ public: View * view() override; const char * title() override; bool handleEvent(Ion::Events::Event event) override; + void viewWillAppear() override; void didBecomeFirstResponder() override; int numberOfRows() override; KDCoordinate cellHeight() override; diff --git a/apps/shared/storage_values_function_parameter_controller.cpp b/apps/shared/storage_values_function_parameter_controller.cpp index e86a5a96e..c457e23e9 100644 --- a/apps/shared/storage_values_function_parameter_controller.cpp +++ b/apps/shared/storage_values_function_parameter_controller.cpp @@ -5,9 +5,12 @@ namespace Shared { const char * StorageValuesFunctionParameterController::title() { + return m_pageTitle; +} + +void StorageValuesFunctionParameterController::viewWillAppear() { StorageFunctionApp * myApp = static_cast(app()); myApp->functionStore()->modelForRecord(m_record)->nameWithArgument(m_pageTitle, StorageFunction::k_maxNameWithArgumentSize, m_symbol); - return m_pageTitle; } void StorageValuesFunctionParameterController::didBecomeFirstResponder() { diff --git a/apps/shared/storage_values_function_parameter_controller.h b/apps/shared/storage_values_function_parameter_controller.h index 9ffa7d1cf..d41e51073 100644 --- a/apps/shared/storage_values_function_parameter_controller.h +++ b/apps/shared/storage_values_function_parameter_controller.h @@ -19,6 +19,7 @@ public: View * view() override { return &m_selectableTableView; } const char * title() override; + void viewWillAppear() override; void didBecomeFirstResponder() override; virtual int numberOfRows() override { return 1; } KDCoordinate cellHeight() override { return Metric::ParameterCellHeight; }