From bd7d5f14dde5923aba100262e5709c22bf3200ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 7 Jan 2020 11:27:51 +0100 Subject: [PATCH] [apps/calculation] additional_outputs: TrigonometryListController set the right angle model to the view --- .../additional_outputs/trigonometry_list_controller.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/calculation/additional_outputs/trigonometry_list_controller.cpp b/apps/calculation/additional_outputs/trigonometry_list_controller.cpp index 6d67decec..cae76ac37 100644 --- a/apps/calculation/additional_outputs/trigonometry_list_controller.cpp +++ b/apps/calculation/additional_outputs/trigonometry_list_controller.cpp @@ -7,13 +7,16 @@ namespace Calculation { void TrigonometryListController::setExpression(Poincare::Expression e) { IllustratedListController::setExpression(e.childAtIndex(0)); - //TODO - //m_model.setAngle(std::complex(1.2f,2.3f)); + // Fill calculation store Poincare::Context * context = App::app()->localContext(); m_calculationStore.push("sin(θ)", context); m_calculationStore.push("cos(θ)", context); m_calculationStore.push("θ", context); + + // Set trigonometry illustration + float angle = Shared::PoincareHelpers::ApproximateToScalar(m_calculationStore.calculationAtIndex(0)->approximateOutput(context), context); + m_model.setAngle(angle); } }