UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 01:00:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] CHange name in curve view:

Browse Source 
evaluateCurveAtAbscissa->evaluateModelWithParameter

Change-Id: Iface679b85d20fc59e8197eb14b516ad86d97862
This commit is contained in:
Émilie Feral
2016-12-27 10:44:41 +01:00
parent fecf0eb3a5
commit 699ee7ddc5
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/curve_view.cpp
View File

@@ -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 */

2
apps/curve_view.h
View File

@@ -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;

2
apps/graph/graph/graph_view.cpp
View File

@@ -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);
}

2
apps/graph/graph/graph_view.h
View File

@@ -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);

2
apps/probability/law_curve_view.cpp
View File

@@ -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);
}

2
apps/probability/law_curve_view.h
View File

@@ -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;
};

2
apps/statistics/histogram_view.cpp
View File

@@ -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();
}

2
apps/statistics/histogram_view.h
View File

@@ -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;