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

[graph] Do not keep a function pointer as member variable but a record.

Browse Source 
Indeed, function pointers can become invalid at any point...
This commit is contained in:
Émilie Feral
2018-10-16 17:56:16 +02:00
parent 974519f61a
commit c70278941a
61 changed files with 510 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/graph/values/storage_function_parameter_controller.cpp
View File

@@ -1,5 +1,6 @@
#include "storage_function_parameter_controller.h"
#include "storage_values_controller.h"
#include "../app.h"
#include <assert.h>
using namespace Shared;
@@ -9,22 +10,16 @@ namespace Graph {
StorageFunctionParameterController::StorageFunctionParameterController(StorageValuesController * valuesController) :
StorageValuesFunctionParameterController('x'),
m_displayDerivativeColumn(I18n::Message::DerivativeFunctionColumn),
m_cartesianFunction(nullptr),
m_valuesController(valuesController)
{
}
void StorageFunctionParameterController::setFunction(StorageFunction * function) {
m_cartesianFunction = (Shared::StorageCartesianFunction *)function;
StorageValuesFunctionParameterController::setFunction(function);
}
bool StorageFunctionParameterController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
switch (selectedRow()) {
case 0:
{
m_cartesianFunction->setDisplayDerivative(!m_cartesianFunction->displayDerivative());
function()->setDisplayDerivative(!function()->displayDerivative());
m_selectableTableView.reloadData();
return true;
}
@@ -62,7 +57,7 @@ int StorageFunctionParameterController::reusableCellCount() {
void StorageFunctionParameterController::viewWillAppear() {
StorageValuesFunctionParameterController::viewWillAppear();
if (m_cartesianFunction->displayDerivative()) {
if (function()->displayDerivative()) {
m_valuesController->selectCellAtLocation(m_valuesController->selectedColumn()+1, m_valuesController->selectedRow());
}
}
@@ -70,8 +65,13 @@ void StorageFunctionParameterController::viewWillAppear() {
void StorageFunctionParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
if (cell == &m_displayDerivativeColumn) {
SwitchView * switchView = (SwitchView *)m_displayDerivativeColumn.accessoryView();
switchView->setState(m_cartesianFunction->displayDerivative());
switchView->setState(function()->displayDerivative());
}
}
StorageCartesianFunction * StorageFunctionParameterController::function() {
App * a = static_cast<App *>(app());
return a->functionStore()->modelForRecord(m_record);
}
}