From a705109b91b9042f448fa2842eecf06883432bc3 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Fri, 20 Sep 2019 16:39:50 +0200 Subject: [PATCH] [apps/graph/graph_view] Factor polar and parametric drawing --- apps/graph/graph/graph_view.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/apps/graph/graph/graph_view.cpp b/apps/graph/graph/graph_view.cpp index b0d3a41bd..3a09ba708 100644 --- a/apps/graph/graph/graph_view.cpp +++ b/apps/graph/graph/graph_view.cpp @@ -64,18 +64,10 @@ void GraphView::drawRect(KDContext * ctx, KDRect rect) const { continue; } - // Polar - if (type == Shared::ContinuousFunction::PlotType::Polar) { - drawCurve(ctx, rect, tmin, tmax, tstep, [](float t, void * model, void * context) { - ContinuousFunction * f = (ContinuousFunction *)model; - Poincare::Context * c = (Poincare::Context *)context; - return f->evaluateXYAtParameter(t, c); - }, f.operator->(), context(), false, f->color()); - continue; - } - - // Parametric - assert(type == Shared::ContinuousFunction::PlotType::Parametric); + // Polar or parametric + assert( + type == Shared::ContinuousFunction::PlotType::Polar || + type == Shared::ContinuousFunction::PlotType::Parametric); drawCurve(ctx, rect, tmin, tmax, tstep, [](float t, void * model, void * context) { ContinuousFunction * f = (ContinuousFunction *)model; Poincare::Context * c = (Poincare::Context *)context;