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

[shared] StorageFunctionGraphController: function pointer life expires

Browse Source 
when another function is called
This commit is contained in:
Émilie Feral
2018-10-12 17:42:30 +02:00
parent a9f32932eb
commit 14fe52023b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/shared/storage_function_graph_controller.cpp
View File

@@ -135,22 +135,21 @@ void StorageFunctionGraphController::initCursorParameters() {
}
bool StorageFunctionGraphController::moveCursorVertically(int direction) {
StorageFunction * actualFunction = functionStore()->activeFunctionAtIndex(indexFunctionSelectedByCursor());
int actualActiveFunctionIndex = indexFunctionSelectedByCursor();
TextFieldDelegateApp * myApp = (TextFieldDelegateApp *)app();
double y = actualFunction->evaluateAtAbscissa(m_cursor->x(), myApp->localContext());
StorageFunction * nextFunction = actualFunction;
double y = functionStore()->activeFunctionAtIndex(actualActiveFunctionIndex)->evaluateAtAbscissa(m_cursor->x(), myApp->localContext());
int nextActiveFunctionIndex = actualActiveFunctionIndex;
double nextY = direction > 0 ? DBL_MAX : -DBL_MAX;
for (int i = 0; i < functionStore()->numberOfActiveFunctions(); i++) {
StorageFunction * f = functionStore()->activeFunctionAtIndex(i);
double newY = f->evaluateAtAbscissa(m_cursor->x(), myApp->localContext());
double newY = functionStore()->activeFunctionAtIndex(i)->evaluateAtAbscissa(m_cursor->x(), myApp->localContext());
bool isNextFunction = direction > 0 ? (newY > y && newY < nextY) : (newY < y && newY > nextY);
if (isNextFunction) {
selectFunctionWithCursor(i);
nextY = newY;
nextFunction = f;
nextActiveFunctionIndex = i;
}
}
if (nextFunction == actualFunction) {
if (nextActiveFunctionIndex == actualActiveFunctionIndex) {
return false;
}
m_cursor->moveTo(m_cursor->x(), nextY);