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

[apps/shared] Rename methods and Factorize comparison logic

Browse Source
This commit is contained in:
Hugo Saint-Vignes
2020-12-16 15:59:12 +01:00
committed by LeaNumworks
parent 10c296e671
commit 479f34502f
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/shared/function_graph_controller.cpp
View File

@@ -1,5 +1,6 @@
#include "function_graph_controller.h"
#include "function_app.h"
#include "poincare_helpers.h"
#include "../apps_container.h"
#include <poincare/coordinate_2D.h>
#include <assert.h>
@@ -123,16 +124,14 @@ bool FunctionGraphController::moveCursorVertically(int direction) {
return true;
}
bool FunctionGraphController::isCursorHanging() {
bool FunctionGraphController::cursorMatchesModel() {
Poincare::Context * context = textFieldDelegateApp()->localContext();
if (indexFunctionSelectedByCursor() >= functionStore()->numberOfActiveFunctions()) {
return true;
return false;
}
ExpiringPointer<Function> f = functionStore()->modelForRecord(functionStore()->activeRecordAtIndex(indexFunctionSelectedByCursor()));
Coordinate2D<double> xy = f->evaluateXYAtParameter(m_cursor->t(), context);
// NaN != Nan returns true, but cursor is not hanging if both values are NaN
return (xy.x1() != m_cursor->x() && !(std::isnan(xy.x1()) && std::isnan(m_cursor->x())))
|| (xy.x2() != m_cursor->y() && !(std::isnan(xy.x2()) && std::isnan(m_cursor->y())));
return PoincareHelpers::equalOrBothNan(xy.x1(), m_cursor->x()) && PoincareHelpers::equalOrBothNan(xy.x2(), m_cursor->y());
}
CurveView * FunctionGraphController::curveView() {