From 699ee7ddc56e24da17c6e31670fdfce475528b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 27 Dec 2016 10:44:41 +0100 Subject: [PATCH] [apps] CHange name in curve view: evaluateCurveAtAbscissa->evaluateModelWithParameter Change-Id: Iface679b85d20fc59e8197eb14b516ad86d97862 --- apps/curve_view.cpp | 16 ++++++++-------- apps/curve_view.h | 2 +- apps/graph/graph/graph_view.cpp | 2 +- apps/graph/graph/graph_view.h | 2 +- apps/probability/law_curve_view.cpp | 2 +- apps/probability/law_curve_view.h | 2 +- apps/statistics/histogram_view.cpp | 2 +- apps/statistics/histogram_view.h | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/curve_view.cpp b/apps/curve_view.cpp index 60541ec1f..291fb5a41 100644 --- a/apps/curve_view.cpp +++ b/apps/curve_view.cpp @@ -185,7 +185,7 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, Model * curve, KDColor c float rectMin = pixelToFloat(Axis::Horizontal, rect.left() - k_externRectMargin); float rectMax = pixelToFloat(Axis::Horizontal, rect.right() + k_externRectMargin); for (float x = rectMin; x < rectMax; x += xStep) { - float y = evaluateCurveAtAbscissa(curve, x); + float y = evaluateModelWithParameter(curve, x); if (!isnan(y)) { float pxf = floatToPixel(Axis::Horizontal, x); float pyf = floatToPixel(Axis::Vertical, y); @@ -197,13 +197,13 @@ void CurveView::drawCurve(KDContext * ctx, KDRect rect, Model * curve, KDColor c ctx->fillRect(colorRect, color); } stampAtLocation(ctx, rect, pxf, pyf, color); - if (x > rectMin && !isnan(evaluateCurveAtAbscissa(curve, x-xStep))) { + if (x > rectMin && !isnan(evaluateModelWithParameter(curve, x-xStep))) { if (continuously) { float puf = floatToPixel(Axis::Horizontal, x - xStep); - float pvf = floatToPixel(Axis::Vertical, evaluateCurveAtAbscissa(curve, x-xStep)); + float pvf = floatToPixel(Axis::Vertical, evaluateModelWithParameter(curve, x-xStep)); straightJoinDots(ctx, rect, puf, pvf, pxf, pyf, color); } else { - jointDots(ctx, rect, curve, x - xStep, evaluateCurveAtAbscissa(curve, x-xStep), x, y, color, k_maxNumberOfIterations); + jointDots(ctx, rect, curve, x - xStep, evaluateModelWithParameter(curve, x-xStep), x, y, color, k_maxNumberOfIterations); } } } @@ -214,7 +214,7 @@ void CurveView::drawDiscreteHistogram(KDContext * ctx, KDRect rect, KDColor colo int rectMin = ceilf(pixelToFloat(Axis::Horizontal, rect.left())); int rectMax = pixelToFloat(Axis::Horizontal, rect.right()); for (int x = rectMin; x < rectMax; x += 1) { - float y = evaluateCurveAtAbscissa(nullptr, x); + float y = evaluateModelWithParameter(nullptr, x); if (!isnan(y)) { float pxf = floatToPixel(Axis::Horizontal, x); float pyf = floatToPixel(Axis::Vertical, y); @@ -240,7 +240,7 @@ void CurveView::drawHistogram(KDContext * ctx, KDRect rect, float firsBarAbsciss int rectMaxBinNumber = floorf((rectMax - firsBarAbscissa)/barWidth); float rectMaxUpperBound = firsBarAbscissa + (rectMaxBinNumber+1)*barWidth + barWidth; for (float x = rectMinLowerBound; x < rectMaxUpperBound; x += barWidth) { - float y = evaluateCurveAtAbscissa(nullptr, x); + float y = evaluateModelWithParameter(nullptr, x); if (!isnan(y)) { float pxf = floatToPixel(Axis::Horizontal, x); float pyf = floatToPixel(Axis::Vertical, y); @@ -284,7 +284,7 @@ void CurveView::stampAtLocation(KDContext * ctx, KDRect rect, float pxf, float p ctx->blendRectWithMask(stampRect, color, (const uint8_t *)shiftedMask, workingBuffer); } -float CurveView::evaluateCurveAtAbscissa(Model * curve, float t) const { +float CurveView::evaluateModelWithParameter(Model * curve, float t) const { return 0.0f; } @@ -308,7 +308,7 @@ void CurveView::jointDots(KDContext * ctx, KDRect rect, Model * curve, float x, } // C is the dot whose abscissa is between x and u float cx = (x + u)/2.0f; - float cy = evaluateCurveAtAbscissa(curve, cx); + float cy = evaluateModelWithParameter(curve, cx); if ((y < cy && cy < v) || (v < cy && cy < y)) { /* As the middle dot is vertically between the two dots, we assume that we * can draw a 'straight' line between the two */ diff --git a/apps/curve_view.h b/apps/curve_view.h index b145ae9d4..a01a5e034 100644 --- a/apps/curve_view.h +++ b/apps/curve_view.h @@ -43,7 +43,7 @@ protected: private: constexpr static float k_marginFactor = 0.2f; int numberOfLabels(Axis axis) const; - virtual float evaluateCurveAtAbscissa(Model * curve, float t) const; + virtual float evaluateModelWithParameter(Model * curve, float t) const; /* Recursively join two dots (dichotomy). The method stops when the * maxNumberOfRecursion in reached. */ void jointDots(KDContext * ctx, KDRect rect, Model * curve, float x, float y, float u, float v, KDColor color, int maxNumberOfRecursion) const; diff --git a/apps/graph/graph/graph_view.cpp b/apps/graph/graph/graph_view.cpp index 6760c0d5a..bb6220ad9 100644 --- a/apps/graph/graph/graph_view.cpp +++ b/apps/graph/graph/graph_view.cpp @@ -195,7 +195,7 @@ void GraphView::drawGrid(KDContext * ctx, KDRect rect) const { drawGridLines(ctx, rect, Axis::Vertical, m_graphWindow->yGridUnit(), k_gridColor); } -float GraphView::evaluateCurveAtAbscissa(Model * curve, float abscissa) const { +float GraphView::evaluateModelWithParameter(Model * curve, float abscissa) const { Function * f = (Function *)curve; return f->evaluateAtAbscissa(abscissa, m_context); } diff --git a/apps/graph/graph/graph_view.h b/apps/graph/graph/graph_view.h index 4f635fe82..0035be7a6 100644 --- a/apps/graph/graph/graph_view.h +++ b/apps/graph/graph/graph_view.h @@ -41,7 +41,7 @@ private: void layoutSubviews() override; char * label(Axis axis, int index) const override; - float evaluateCurveAtAbscissa(Model * expression, float abscissa) const override; + float evaluateModelWithParameter(Model * expression, float abscissa) const override; void drawGrid(KDContext * ctx, KDRect rect) const; void drawGridLines(KDContext * ctx, KDRect rect, Axis axis, float step, KDColor color) const; void updateBannerView(Function * function); diff --git a/apps/probability/law_curve_view.cpp b/apps/probability/law_curve_view.cpp index 630c93379..d7bbcddd5 100644 --- a/apps/probability/law_curve_view.cpp +++ b/apps/probability/law_curve_view.cpp @@ -51,7 +51,7 @@ char * LawCurveView::label(Axis axis, int index) const { return (char *)m_labels[index]; } -float LawCurveView::evaluateCurveAtAbscissa(void * law, float abscissa) const { +float LawCurveView::evaluateModelWithParameter(void * law, float abscissa) const { return m_law->evaluateAtAbscissa(abscissa); } diff --git a/apps/probability/law_curve_view.h b/apps/probability/law_curve_view.h index 9f28f3135..0842ca85c 100644 --- a/apps/probability/law_curve_view.h +++ b/apps/probability/law_curve_view.h @@ -21,7 +21,7 @@ protected: char * label(Axis axis, int index) const override; private: char m_labels[k_maxNumberOfXLabels][Constant::FloatBufferSizeInScientificMode]; - float evaluateCurveAtAbscissa(Model * law, float abscissa) const override; + float evaluateModelWithParameter(Model * law, float abscissa) const override; Law * m_law; Calculation * m_calculation; }; diff --git a/apps/statistics/histogram_view.cpp b/apps/statistics/histogram_view.cpp index 1f59e3cf7..2745ce685 100644 --- a/apps/statistics/histogram_view.cpp +++ b/apps/statistics/histogram_view.cpp @@ -75,7 +75,7 @@ char * HistogramView::label(Axis axis, int index) const { return (char *)m_labels[index]; } -float HistogramView::evaluateCurveAtAbscissa(Model * curve, float t) const { +float HistogramView::evaluateModelWithParameter(Model * curve, float t) const { return (float)m_data->heightForBarAtValue(t)/(float)m_data->totalSize(); } diff --git a/apps/statistics/histogram_view.h b/apps/statistics/histogram_view.h index da8ffa8d0..e8f69c12e 100644 --- a/apps/statistics/histogram_view.h +++ b/apps/statistics/histogram_view.h @@ -22,7 +22,7 @@ private: View * subviewAtIndex(int index) override; void layoutSubviews() override; char * label(Axis axis, int index) const override; - float evaluateCurveAtAbscissa(Model * curve, float t) const override; + float evaluateModelWithParameter(Model * curve, float t) const override; Data * m_data; char m_labels[k_maxNumberOfXLabels][Constant::FloatBufferSizeInScientificMode]; bool m_selectedBins;