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/continuous_function] Forced X axis display

Browse Source 
The auto zoom did not display the X axis when drawing positive curves
with roots, such as sqrt(x).

Change-Id: Ic80fd3207691dc917f7b64c07d7745ab5df1daa3
This commit is contained in:
Gabriel Ozouf
2020-08-13 11:23:49 +02:00
committed by Émilie Feral
parent a1aefb0cb2
commit 33f9bb50a3
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/shared/continuous_function.cpp
View File

@@ -378,7 +378,7 @@ void ContinuousFunction::interestingXAndYRangesForDisplay(float * xMin, float *
float firstResult;
float dXOld, dXPrev, dXNext, yOld, yPrev, yNext;
/* Look for an point of interest at the center. */
/* Look for a point of interest at the center. */
const float a = center - minDistance - FLT_EPSILON, b = center + FLT_EPSILON, c = center + minDistance + FLT_EPSILON;
const float ya = evaluateAndRound(this, a, context), yb = evaluateAndRound(this, b, context), yc = evaluateAndRound(this, c, context);
if (boundOfIntervalOfDefinitionIsReached(ya, yc) ||
@@ -502,7 +502,8 @@ void ContinuousFunction::refinedYRangeForDisplay(float xMin, float xMax, float *
assert(plotType() == PlotType::Cartesian);
assert(yMin && yMax);
constexpr int sampleSize = 80;
constexpr int sampleSize = Ion::Display::Width / 4;
constexpr float boundNegligigbleThreshold = 0.2f;
float sampleYMin = FLT_MAX, sampleYMax = -FLT_MAX;
const float step = (xMax - xMin) / (sampleSize - 1);
@@ -520,7 +521,7 @@ void ContinuousFunction::refinedYRangeForDisplay(float xMin, float xMax, float *
pop++;
}
}
/* sum/n is the log mean value of the function, which can be interpreted as
/* sum/pop is the log mean value of the function, which can be interpreted as
* its average order of magnitude. Then, bound is the value for the next
* order of magnitude and is used to cut the Y range. */
float bound = (pop > 0) ? std::exp(sum / pop + 1.f) : FLT_MAX;
@@ -531,6 +532,14 @@ void ContinuousFunction::refinedYRangeForDisplay(float xMin, float xMax, float *
*yMin -= d;
*yMax += d;
}
/* Round out the smallest bound to 0 if it is negligible compare to the
* other one. This way, we can display the X axis for positive functions such
* as sqrt(x) even if we do not sample close to 0. */
if (*yMin > 0.f && *yMin / *yMax < boundNegligigbleThreshold) {
*yMin = 0.f;
} else if (*yMax < 0.f && *yMax / *yMin < boundNegligigbleThreshold) {
*yMax = 0.f;
}
}
void * ContinuousFunction::Model::expressionAddress(const Ion::Storage::Record * record) const {