From a45af36bfee75c72b1b02bd92ebc6620158124e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 28 Aug 2019 10:43:03 +0200 Subject: [PATCH] [apps/curve_view_cursor] t member --- apps/shared/curve_view_cursor.cpp | 21 +++++++++++---------- apps/shared/curve_view_cursor.h | 4 +++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/apps/shared/curve_view_cursor.cpp b/apps/shared/curve_view_cursor.cpp index 7645da9cb..c36aa0b96 100644 --- a/apps/shared/curve_view_cursor.cpp +++ b/apps/shared/curve_view_cursor.cpp @@ -3,22 +3,23 @@ namespace Shared { -CurveViewCursor::CurveViewCursor() : - m_x(NAN), - m_y(NAN) -{ -} +CurveViewCursor::CurveViewCursor() : m_t(NAN), m_x(NAN), m_y(NAN) {} -void CurveViewCursor::moveTo(double x, double y) { - m_x = clipped(x, false); +void CurveViewCursor::moveTo(double t, double x, double y) { + m_t = clipped(t, false); + m_x = clipped(x, false); //TODO LEA ? m_y = clipped(y, true); } double CurveViewCursor::clipped(double x, bool canBeInfinite) { double maxValue = canBeInfinite ? INFINITY : k_maxFloat; - double clippedX = x > k_maxFloat ? maxValue : x; - clippedX = clippedX < - k_maxFloat ? -maxValue : clippedX; - return clippedX; + if (x > k_maxFloat) { + return maxValue; + } + if (x < -k_maxFloat) { + return -maxValue; + } + return x; } } diff --git a/apps/shared/curve_view_cursor.h b/apps/shared/curve_view_cursor.h index ea013e19e..661c10db5 100644 --- a/apps/shared/curve_view_cursor.h +++ b/apps/shared/curve_view_cursor.h @@ -6,12 +6,14 @@ namespace Shared { class CurveViewCursor { public: CurveViewCursor(); + double t() const { return m_t; } double x() const { return m_x; } double y() const { return m_y; } - void moveTo(double x, double y); + void moveTo(double t, double x, double y); private: static double clipped(double f, bool canBeInfinite); constexpr static double k_maxFloat = 1E+8; + double m_t; double m_x; double m_y; };