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

[apps] Add angle unit preference in apps

Browse Source 
Change-Id: I25eb760883d164563cb3059d73e8d1fff92ad6da
This commit is contained in:
Émilie Feral
2017-02-01 16:59:54 +01:00
parent e4d08ee685
commit 39dab5125c
12 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/graph/function.cpp
View File

@@ -75,19 +75,19 @@ void Function::setDisplayDerivative(bool display) {
m_displayDerivative = display;
}
float Function::evaluateAtAbscissa(float x, Context * context) const {
float Function::evaluateAtAbscissa(float x, Context * context, Expression::AngleUnit angleUnit) const {
Symbol xSymbol = Symbol('x');
Float e = Float(x);
context->setExpressionForSymbolName(&e, &xSymbol);
return m_expression->approximate(*context);
return m_expression->approximate(*context, angleUnit);
}
float Function::approximateDerivative(float x, Context * context) const {
float Function::approximateDerivative(float x, Context * context, Expression::AngleUnit angleUnit) const {
Float abscissa = Float(x);
Expression * args[2] = {m_expression, &abscissa};
Derivative derivative = Derivative();
derivative.setArgument(args, 2, true);
return derivative.approximate(*context);
return derivative.approximate(*context, angleUnit);
}
}