UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-30 12:10:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

[apps/proba] Fix Normal distribution undercurve colouring

Browse Source 
Reverts 01d2db1342
This commit is contained in:
Léa Saviot
2019-09-25 10:39:23 +02:00
committed by EmilieNumworks
parent b3e72835f0
commit c768c15826
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/probability/distribution_curve_view.cpp
View File

@@ -20,8 +20,12 @@ void DistributionCurveView::drawRect(KDContext * ctx, KDRect rect) const {
drawAxis(ctx, rect, Axis::Horizontal);
drawLabels(ctx, rect, Axis::Horizontal, false, false, false, 0, k_backgroundColor);
if (m_distribution->type() == Distribution::Type::Normal) {
// Special case for the normal distribution, which has always the same curve
drawStandardNormal(ctx, rect, lowerBound, upperBound);
/* Special case for the normal distribution, which has always the same curve
* We indicate the pixels from and to which we color under the curve, not
* the float values, as we change the curve parameters. */
float pixelColorLowerBound = std::round(floatToPixel(Axis::Horizontal, lowerBound));
float pixelColorUpperBound = std::round(floatToPixel(Axis::Horizontal, upperBound));
drawStandardNormal(ctx, rect, pixelColorLowerBound, pixelColorUpperBound);
return;
}
if (m_distribution->isContinuous()) {
@@ -47,7 +51,7 @@ Poincare::Coordinate2D<float> DistributionCurveView::EvaluateXYAtAbscissa(float
return Poincare::Coordinate2D<float>(abscissa, EvaluateAtAbscissa(abscissa, model, context));
}
void DistributionCurveView::drawStandardNormal(KDContext * ctx, KDRect rect, float colorLowerBound, float colorUpperBound) const {
void DistributionCurveView::drawStandardNormal(KDContext * ctx, KDRect rect, float colorLowerBoundPixel, float colorUpperBoundPixel) const {
// Save the previous curve view range
DistributionCurveView * constCastedThis = const_cast<DistributionCurveView *>(this);
CurveViewRange * previousRange = curveViewRange();
@@ -55,7 +59,7 @@ void DistributionCurveView::drawStandardNormal(KDContext * ctx, KDRect rect, flo
// Draw a centered reduced normal curve
NormalDistribution n;
constCastedThis->setCurveViewRange(&n);
drawCartesianCurve(ctx, rect, -INFINITY, INFINITY, EvaluateXYAtAbscissa, &n, nullptr, Palette::YellowDark, true, colorLowerBound, colorUpperBound);
drawCartesianCurve(ctx, rect, -INFINITY, INFINITY, EvaluateXYAtAbscissa, &n, nullptr, Palette::YellowDark, true, pixelToFloat(Axis::Horizontal, colorLowerBoundPixel), pixelToFloat(Axis::Horizontal, colorUpperBoundPixel));
// Put back the previous curve view range
constCastedThis->setCurveViewRange(previousRange);