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

[poincare] Get rid of AngleUnit::Default

Browse Source
This commit is contained in:
Émilie Feral
2018-04-23 17:52:23 +02:00
parent 2e7c08241a
commit e61a408a0a
39 changed files with 198 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/calculation/calculation.cpp
View File

@@ -61,9 +61,9 @@ void Calculation::setContent(const char * c, Context * context, Expression * ans
/* We do not store directly the text enter by the user because we do not want
* to keep Ans symbol in the calculation store. */
PoincareHelpers::WriteTextInBuffer(m_input, m_inputText, sizeof(m_inputText));
m_exactOutput = Expression::ParseAndSimplify(m_inputText, *context);
m_exactOutput = PoincareHelpers::ParseAndSimplify(m_inputText, *context);
PoincareHelpers::WriteTextInBuffer(m_exactOutput, m_exactOutputText, sizeof(m_exactOutputText));
m_approximateOutput = m_exactOutput->approximate<double>(*context);
m_approximateOutput = PoincareHelpers::Approximate<double>(m_exactOutput, *context);
PoincareHelpers::WriteTextInBuffer(m_approximateOutput, m_approximateOutputText, sizeof(m_approximateOutputText));
}
@@ -172,7 +172,7 @@ Expression * Calculation::approximateOutput(Context * context) {
* call 'evaluate'. */
Expression * exp = Expression::parse(m_approximateOutputText);
if (exp != nullptr) {
m_approximateOutput = exp->approximate<double>(*context);
m_approximateOutput = PoincareHelpers::Approximate<double>(exp, *context);
delete exp;
} else {
m_approximateOutput = new Undefined();
@@ -202,7 +202,7 @@ Calculation::EqualSign Calculation::exactAndApproximateDisplayedOutputsAreEqual(
if (m_equalSign != EqualSign::Unknown) {
return m_equalSign;
}
m_equalSign = exactOutput(context)->isEqualToItsApproximationLayout(approximateOutput(context), k_printedExpressionSize, Preferences::sharedPreferences()->displayMode(), Preferences::sharedPreferences()->numberOfSignificantDigits(), *context) ? EqualSign::Equal : EqualSign::Approximation;
m_equalSign = exactOutput(context)->isEqualToItsApproximationLayout(approximateOutput(context), k_printedExpressionSize, Preferences::sharedPreferences()->angleUnit(), Preferences::sharedPreferences()->displayMode(), Preferences::sharedPreferences()->numberOfSignificantDigits(), *context) ? EqualSign::Equal : EqualSign::Approximation;
return m_equalSign;
}