From f44c086804ca020a3028ca3598f7d3f1a38f60b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 28 Aug 2019 17:23:31 +0200 Subject: [PATCH] [apps/cartesian_function] Fix angle conversion --- apps/shared/cartesian_function.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/shared/cartesian_function.cpp b/apps/shared/cartesian_function.cpp index e8e0643c5..c5fd33fb9 100644 --- a/apps/shared/cartesian_function.cpp +++ b/apps/shared/cartesian_function.cpp @@ -121,7 +121,14 @@ Poincare::Coordinate2D CartesianFunction::privateEvaluateXYAtParameter(T t, P } assert(type == PlotType::Polar); T factor = (T)1.0; - // TODO LEA RUBEN + Preferences::AngleUnit angleUnit = Preferences::sharedPreferences()->angleUnit(); + if (angleUnit == Preferences::AngleUnit::Degree) { + factor = (T) (M_PI/180.0); + } else if (angleUnit == Preferences::AngleUnit::Gradian) { + factor = (T) (M_PI/200.0); + } else { + assert(angleUnit == Preferences::AngleUnit::Radian); + } return Coordinate2D(x1x2.x2() * std::cos(x1x2.x1()*factor), x1x2.x2() * std::sin(x1x2.x1()*factor)); }