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

[apps] Coding style

Browse Source
This commit is contained in:
Léa Saviot
2018-10-15 11:29:25 +02:00
committed by Émilie Feral
parent 14fe52023b
commit 17f33b8797
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/shared/storage_function_graph_controller.cpp
View File

@@ -135,12 +135,13 @@ void StorageFunctionGraphController::initCursorParameters() {
}
bool StorageFunctionGraphController::moveCursorVertically(int direction) {
int actualActiveFunctionIndex = indexFunctionSelectedByCursor();
int currentActiveFunctionIndex = indexFunctionSelectedByCursor();
TextFieldDelegateApp * myApp = (TextFieldDelegateApp *)app();
double y = functionStore()->activeFunctionAtIndex(actualActiveFunctionIndex)->evaluateAtAbscissa(m_cursor->x(), myApp->localContext());
int nextActiveFunctionIndex = actualActiveFunctionIndex;
double y = functionStore()->activeFunctionAtIndex(currentActiveFunctionIndex)->evaluateAtAbscissa(m_cursor->x(), myApp->localContext());
int nextActiveFunctionIndex = currentActiveFunctionIndex;
double nextY = direction > 0 ? DBL_MAX : -DBL_MAX;
for (int i = 0; i < functionStore()->numberOfActiveFunctions(); i++) {
int activeFunctionsCount = functionStore()->numberOfActiveFunctions();
for (int i = 0; i < activeFunctionsCount; i++) {
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) {
@@ -149,7 +150,7 @@ bool StorageFunctionGraphController::moveCursorVertically(int direction) {
nextActiveFunctionIndex = i;
}
}
if (nextActiveFunctionIndex == actualActiveFunctionIndex) {
if (nextActiveFunctionIndex == currentActiveFunctionIndex) {
return false;
}
m_cursor->moveTo(m_cursor->x(), nextY);