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

[poincare/zoom] Method SetToRatio

Browse Source 
Added a method to Zoom to set a range to a specific ratio. This method
is used by InteractiveCurveViewRange::normalize.

Change-Id: Id3029439294ece02ea19fb6c6de90b9edc85d771
This commit is contained in:
Gabriel Ozouf
2020-10-08 16:36:37 +02:00
committed by Émilie Feral
parent c4aad1641e
commit 08c96c5107
3 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/shared/interactive_curve_view_range.cpp
View File

@@ -4,6 +4,7 @@
#include <stddef.h>
#include <assert.h>
#include <poincare/preferences.h>
#include <poincare/zoom.h>
#include <algorithm>
using namespace Poincare;
@@ -88,27 +89,19 @@ void InteractiveCurveViewRange::normalize() {
/* We center the ranges on the current range center, and put each axis so that
* 1cm = 2 current units. */
float xRange = xMax() - xMin();
float yRange = yMax() - yMin();
float xyRatio = xRange/yRange;
float newXMin = xMin(), newXMax = xMax(), newYMin = yMin(), newYMax = yMax();
const float unit = std::max(xGridUnit(), yGridUnit());
const float newXHalfRange = NormalizedXHalfRange(unit);
const float newYHalfRange = NormalizedYHalfRange(unit);
float normalizedXYRatio = newXHalfRange/newYHalfRange;
if (xyRatio < normalizedXYRatio) {
float newXRange = normalizedXYRatio * yRange;
assert(newXRange >= xRange);
float delta = (newXRange - xRange) / 2.0f;
m_xRange.setMin(xMin() - delta, k_lowerMaxFloat, k_upperMaxFloat);
MemoizedCurveViewRange::protectedSetXMax(xMax()+delta, k_lowerMaxFloat, k_upperMaxFloat);
} else if (xyRatio > normalizedXYRatio) {
float newYRange = newYHalfRange/newXHalfRange * xRange;
assert(newYRange >= yRange);
float delta = (newYRange - yRange) / 2.0f;
m_yRange.setMin(yMin() - delta, k_lowerMaxFloat, k_upperMaxFloat);
MemoizedCurveViewRange::protectedSetYMax(yMax()+delta, k_lowerMaxFloat, k_upperMaxFloat);
}
float normalizedYXRatio = newYHalfRange/newXHalfRange;
Zoom::SetToRatio(normalizedYXRatio, &newXMin, &newXMax, &newYMin, &newYMax);
m_xRange.setMin(newXMin, k_lowerMaxFloat, k_upperMaxFloat);
MemoizedCurveViewRange::protectedSetXMax(newXMax, k_lowerMaxFloat, k_upperMaxFloat);
m_yRange.setMin(newYMin, k_lowerMaxFloat, k_upperMaxFloat);
MemoizedCurveViewRange::protectedSetYMax(newYMax, k_lowerMaxFloat, k_upperMaxFloat);
}
void InteractiveCurveViewRange::setDefault() {

4
poincare/include/poincare/zoom.h
View File

@@ -15,6 +15,10 @@ public:
static void InterestingRangesForDisplay(ValueAtAbscissa evaluation, float * xMin, float * xMax, float * yMin, float * yMax, float tMin, float tMax, Context * context, const void * auxiliary);
static void RefinedYRangeForDisplay(ValueAtAbscissa evaluation, float xMin, float xMax, float * yMin, float * yMax, Context * context, const void * auxiliary, bool boundByMagnitude = false);
/* If shrink is false, the range will be set to ratio by increasing the size
* of the smallest axis. If it is true, the longest axis will be reduced.*/
static void SetToRatio(float yxRatio, float * xMin, float * xMax, float * yMin, float * yMax, bool shrink = false);
private:
static constexpr int k_peakNumberOfPointsOfInterest = 3;
static constexpr int k_sampleSize = Ion::Display::Width / 4;

23
poincare/src/zoom.cpp
View File

@@ -199,6 +199,29 @@ void Zoom::RefinedYRangeForDisplay(ValueAtAbscissa evaluation, float xMin, float
}
}
void Zoom::SetToRatio(float yxRatio, float * xMin, float * xMax, float * yMin, float * yMax, bool shrink) {
float currentRatio = (*yMax - *yMin) / (*xMax - *xMin);
float * tMin;
float * tMax;
float newRange;
if ((currentRatio < yxRatio) == shrink) {
/* Y axis too small and shrink, or Y axis too large and do not shrink
* --> we change the X axis*/
tMin = xMin;
tMax = xMax;
newRange = (*yMax - *yMin) / yxRatio;
} else {
tMin = yMin;
tMax = yMax;
newRange = (*xMax - *xMin) * yxRatio;
}
float center = (*tMax + *tMin) / 2.f;
*tMax = center + newRange / 2.f;
*tMin = center - newRange / 2.f;
}
bool Zoom::IsConvexAroundExtremum(ValueAtAbscissa evaluation, float x1, float x2, float x3, float y1, float y2, float y3, Context * context, const void * auxiliary, int iterations) {
if (iterations <= 0) {
return false;