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] Clean shared/interactive_curve_view_range.cpp

Browse Source
This commit is contained in:
Léa Saviot
2018-12-04 11:57:17 +01:00
parent c50aba1873
commit 020e459379
1 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
apps/shared/interactive_curve_view_range.cpp
View File

@@ -10,6 +10,9 @@ using namespace Poincare;
namespace Shared {
static inline float min(float x, float y) { return (x<y ? x : y); }
static inline float max(float x, float y) { return (x>y ? x : y); }
uint32_t InteractiveCurveViewRange::rangeChecksum() {
float data[5] = {m_xMin, m_xMax, m_yMin, m_yMax, m_yAuto ? 1.0f : 0.0f};
size_t dataLengthInBytes = 5*sizeof(float);
@@ -76,7 +79,7 @@ void InteractiveCurveViewRange::zoom(float ratio, float x, float y) {
m_xMax = newXMax;
MemoizedCurveViewRange::setXMin(newXMin);
}
m_yAuto = false;
setYAuto(false);
float newYMin = clipped(centerY*(1.0f-ratio)+ratio*yMin, false);
float newYMax = clipped(centerY*(1.0f-ratio)+ratio*yMax, true);
if (!std::isnan(newYMin) && !std::isnan(newYMax)) {
@@ -86,7 +89,7 @@ void InteractiveCurveViewRange::zoom(float ratio, float x, float y) {
}
void InteractiveCurveViewRange::panWithVector(float x, float y) {
m_yAuto = false;
setYAuto(false);
if (clipped(m_xMin + x, false) != m_xMin + x || clipped(m_xMax + x, true) != m_xMax + x || clipped(m_yMin + y, false) != m_yMin + y || clipped(m_yMax + y, true) != m_yMax + y || std::isnan(clipped(m_xMin + x, false)) || std::isnan(clipped(m_xMax + x, true)) || std::isnan(clipped(m_yMin + y, false)) || std::isnan(clipped(m_yMax + y, true))) {
return;
}
@@ -97,6 +100,7 @@ void InteractiveCurveViewRange::panWithVector(float x, float y) {
}
void InteractiveCurveViewRange::roundAbscissa() {
// Set x range
float xMin = m_xMin;
float xMax = m_xMax;
float newXMin = clipped(std::round((xMin+xMax)/2) - (float)Ion::Display::Width/2.0f, false);
@@ -106,6 +110,7 @@ void InteractiveCurveViewRange::roundAbscissa() {
}
m_xMax = newXMax;
MemoizedCurveViewRange::setXMin(newXMin);
// Set y range
notifyRangeChange();
}
@@ -114,15 +119,19 @@ void InteractiveCurveViewRange::normalize() {
float xMax = m_xMax;
float yMin = m_yMin;
float yMax = m_yMax;
float newXMin = clipped((xMin+xMax)/2 - 5.3f, false);
float newXMax = clipped((xMin+xMax)/2 + 5.3f, true);
// Set x range
float xMargin = 5.3f;
float newXMin = clipped((xMin+xMax)/2 - xMargin, false);
float newXMax = clipped((xMin+xMax)/2 + xMargin, true);
if (!std::isnan(newXMin) && !std::isnan(newXMax)) {
m_xMax = newXMax;
MemoizedCurveViewRange::setXMin(newXMin);
}
m_yAuto = false;
float newYMin = clipped((yMin+yMax)/2 - 3.1f, false);
float newYMax = clipped((yMin+yMax)/2 + 3.1f, true);
// Set y range
setYAuto(false);
float yMargin = 3.1f;
float newYMin = clipped((yMin+yMax)/2 - yMargin, false);
float newYMax = clipped((yMin+yMax)/2 + yMargin, true);
if (!std::isnan(newYMin) && !std::isnan(newYMax)) {
m_yMax = newYMax;
MemoizedCurveViewRange::setYMin(newYMin);
@@ -130,15 +139,15 @@ void InteractiveCurveViewRange::normalize() {
}
void InteractiveCurveViewRange::setTrigonometric() {
m_xMax = 10.5f;
MemoizedCurveViewRange::setXMin(-10.5f);
if (Preferences::sharedPreferences()->angleUnit() == Preferences::AngleUnit::Degree) {
m_xMax = 600.0f;
MemoizedCurveViewRange::setXMin(-600.0f);
}
m_yAuto = false;
m_yMax = 1.6f;
MemoizedCurveViewRange::setYMin(-1.6f);
// Set x range
float x = (Preferences::sharedPreferences()->angleUnit() == Preferences::AngleUnit::Degree) ? 600.0f : 10.5f;
m_xMax = x;
MemoizedCurveViewRange::setXMin(-x);
// Set y range
setYAuto(false);
float y = 1.6f;
m_yMax = y;
MemoizedCurveViewRange::setYMin(-y);
}
void InteractiveCurveViewRange::setDefault() {
@@ -162,7 +171,7 @@ void InteractiveCurveViewRange::centerAxisAround(Axis axis, float position) {
m_xMax = clipped(position + range/2.0f, true);
MemoizedCurveViewRange::setXMin(clipped(position - range/2.0f, false));
} else {
m_yAuto = false;
setYAuto(false);
float range = m_yMax - m_yMin;
if (std::fabs(position/range) > k_maxRatioPositionRange) {
range = std::pow(10.0f, std::floor(std::log10(std::fabs(position)))-1.0f);
@@ -179,23 +188,23 @@ void InteractiveCurveViewRange::panToMakePointVisible(float x, float y, float to
float newXMin = clipped(x - leftMarginRation*xRange, false);
m_xMax = clipped(newXMin + xRange, true);
MemoizedCurveViewRange::setXMin(newXMin);
m_yAuto = false;
setYAuto(false);
}
if (x > m_xMax - rightMarginRatio*xRange + FLT_EPSILON && !std::isinf(x) && !std::isnan(x)) {
m_xMax = clipped(x + rightMarginRatio*xRange, true);
MemoizedCurveViewRange::setXMin(clipped(m_xMax - xRange, false));
m_yAuto = false;
setYAuto(false);
}
if (y < m_yMin + bottomMarginRation*yRange - FLT_EPSILON && !std::isinf(y) && !std::isnan(y)) {
float newYMin = clipped(y - bottomMarginRation*yRange, false);
m_yMax = clipped(newYMin + yRange, true);
MemoizedCurveViewRange::setYMin(newYMin);
m_yAuto = false;
setYAuto(false);
}
if (y > m_yMax - topMarginRatio*yRange + FLT_EPSILON && !std::isinf(y) && !std::isnan(y)) {
m_yMax = clipped(y + topMarginRatio*yRange, true);
MemoizedCurveViewRange::setYMin(clipped(m_yMax - yRange, false));
m_yAuto = false;
setYAuto(false);
}
}
@@ -206,11 +215,9 @@ bool InteractiveCurveViewRange::isCursorVisible(float topMarginRatio, float righ
}
float InteractiveCurveViewRange::clipped(float x, bool isMax) {
float max = isMax ? k_upperMaxFloat : k_lowerMaxFloat;
float min = isMax ? -k_lowerMaxFloat : -k_upperMaxFloat;
float clippedX = x > max ? max : x;
clippedX = clippedX < min ? min : clippedX;
return clippedX;
float maxF = isMax ? k_upperMaxFloat : k_lowerMaxFloat;
float minF = isMax ? -k_lowerMaxFloat : -k_upperMaxFloat;
return max(minF, min(x, maxF));
}
void InteractiveCurveViewRange::notifyRangeChange() {