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

[apps] Change curve view API

Browse Source 
Change-Id: I77984536d1a8b4197b02e2f005590537a46d8084
This commit is contained in:
Émilie Feral
2016-12-14 17:48:40 +01:00
parent f85ee9bc68
commit 38b8c6dbd7
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ void GraphView::drawRect(KDContext * ctx, KDRect rect) const {
drawLabels(Axis::Vertical, ctx, rect);
for (int i = 0; i < m_functionStore->numberOfActiveFunctions(); i++) {
Function * f = m_functionStore->activeFunctionAtIndex(i);
drawExpression(f->expression(), f->color(), ctx, rect);
drawCurve(f, f->color(), ctx, rect);
}
}
@@ -194,11 +194,9 @@ float GraphView::max(Axis axis) const {
return (axis == Axis::Horizontal ? m_graphWindow->xMax() : m_graphWindow->yMax());
}
float GraphView::evaluateExpressionAtAbscissa(Expression * expression, float abscissa) const {
Symbol xSymbol = Symbol('x');
Float e = Float(abscissa);
m_context->setExpressionForSymbolName(&e, &xSymbol);
return expression->approximate(*m_context);
float GraphView::evaluateCurveAtAbscissa(void * curve, float abscissa) const {
Function * f = (Function *)curve;
return f->evaluateAtAbscissa(abscissa, m_context);
}
}