diff --git a/apps/calculation/calculation.cpp b/apps/calculation/calculation.cpp index 4e1105697..14e99efb3 100644 --- a/apps/calculation/calculation.cpp +++ b/apps/calculation/calculation.cpp @@ -41,7 +41,7 @@ void Calculation::setContent(const char * c, Context * context, Expression ansEx * to keep Ans symbol in the calculation store. */ PoincareHelpers::Serialize(input, m_inputText, sizeof(m_inputText)); } - Expression exactOutput = PoincareHelpers::ParseAndSimplify(m_inputText, *context); + Expression exactOutput = PoincareHelpers::ParseAndSimplifyForComplexFormat(m_inputText, *context); PoincareHelpers::Serialize(exactOutput, m_exactOutputText, sizeof(m_exactOutputText)); Expression approximateOutput = PoincareHelpers::Approximate(exactOutput, *context); PoincareHelpers::Serialize(approximateOutput, m_approximateOutputText, sizeof(m_approximateOutputText)); diff --git a/apps/shared/poincare_helpers.h b/apps/shared/poincare_helpers.h index a9a2b9ef6..e57f89d2b 100644 --- a/apps/shared/poincare_helpers.h +++ b/apps/shared/poincare_helpers.h @@ -41,6 +41,10 @@ inline Poincare::Expression ParseAndSimplify(const char * text, Poincare::Contex return Poincare::Expression::ParseAndSimplify(text, context, Poincare::Preferences::sharedPreferences()->angleUnit()); } +inline Poincare::Expression ParseAndSimplifyForComplexFormat(const char * text, Poincare::Context & context) { + return Poincare::Expression::ParseAndSimplifyForComplexFormat(text, context, Poincare::Preferences::sharedPreferences()->angleUnit(), Poincare::Preferences::sharedPreferences()->complexFormat()); +} + inline void Simplify(Poincare::Expression * e, Poincare::Context & context) { *e = e->simplify(context, Poincare::Preferences::sharedPreferences()->angleUnit()); }