UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +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() {

2
apps/shared/function_graph_controller.h
View File

@@ -37,7 +37,7 @@ protected:
Poincare::Coordinate2D<double> xyValues(int curveIndex, double t, Poincare::Context * context) const override;
int numberOfCurves() const override;
void initCursorParameters() override;
bool isCursorHanging() override;
bool cursorMatchesModel() override;
CurveView * curveView() override;
void yRangeForCursorFirstMove(Shared::InteractiveCurveViewRange * range) const;

2
apps/shared/interactive_curve_view_controller.cpp
View File

@@ -136,7 +136,7 @@ void InteractiveCurveViewController::viewWillAppear() {
/* Warning: init cursor parameter before reloading banner view. Indeed,
* reloading banner view needs an updated cursor to load the right data. */
uint32_t newRangeVersion = rangeVersion();
if ((*m_rangeVersion != newRangeVersion && !isCursorVisible()) || isCursorHanging()) {
if ((*m_rangeVersion != newRangeVersion && !isCursorVisible()) || !cursorMatchesModel()) {
initCursorParameters();
}
*m_rangeVersion = newRangeVersion;

4
apps/shared/interactive_curve_view_controller.h
View File

@@ -41,8 +41,8 @@ protected:
virtual bool moveCursorVertically(int direction) = 0;
virtual uint32_t rangeVersion() = 0;
bool isCursorVisible();
// The cursor is hanging if the selected function has been edited or deleted
virtual bool isCursorHanging() = 0;
// The cursor does not match if selected model has been edited or deleted
virtual bool cursorMatchesModel() = 0;
// Closest vertical curve helper
int closestCurveIndexVertically(bool goingUp, int currentSelectedCurve, Poincare::Context * context) const;

2
apps/shared/poincare_helpers.h
View File

@@ -108,6 +108,8 @@ inline typename Poincare::Coordinate2D<double> NextIntersection(const Poincare::
return e.nextIntersection(symbol, start, step, max, context, complexFormat, preferences->angleUnit(), expression);
}
inline bool equalOrBothNan(double a, double b) { return a == b || (std::isnan(a) && std::isnan(b)); }
}
}