From bfa69cb4f1e8e9e94857b336317aa05c82fcfbb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Fri, 15 Jun 2018 11:56:17 +0200
Subject: [PATCH] [apps/reg] Reinit cursor when model changes

---
 apps/regression/graph_controller.cpp | 9 +++++++++
 apps/regression/graph_controller.h   | 1 +
 2 files changed, 10 insertions(+)

diff --git a/apps/regression/graph_controller.cpp b/apps/regression/graph_controller.cpp
index ae1ceeacf..6c9f50405 100644
--- a/apps/regression/graph_controller.cpp
+++ b/apps/regression/graph_controller.cpp
@@ -19,6 +19,9 @@ GraphController::GraphController(Responder * parentResponder, ButtonRowControlle
   m_selectedDotIndex(selectedDotIndex),
   m_selectedSeriesIndex(selectedSeriesIndex)
 {
+  for (int i = 0; i < Store::k_numberOfSeries; i++) {
+    m_modelType[i] = (Model::Type) -1;
+  }
   m_store->setCursor(m_cursor);
 }
 
@@ -36,6 +39,12 @@ I18n::Message GraphController::emptyMessage() {
 
 void GraphController::viewWillAppear() {
   InteractiveCurveViewController::viewWillAppear();
+  if (m_modelType[*m_selectedSeriesIndex] != m_store->seriesRegressionType(*m_selectedSeriesIndex)) {
+    initCursorParameters();
+  }
+  for (int i = 0; i < Store::k_numberOfSeries; i++) {
+    m_modelType[i] = m_store->seriesRegressionType(*m_selectedSeriesIndex);
+  }
   if (*m_selectedSeriesIndex < 0) {
     *m_selectedSeriesIndex = m_store->indexOfKthNonEmptySeries(0);
   }
diff --git a/apps/regression/graph_controller.h b/apps/regression/graph_controller.h
index 4c1b0d2f1..4841cbab8 100644
--- a/apps/regression/graph_controller.h
+++ b/apps/regression/graph_controller.h
@@ -51,6 +51,7 @@ private:
    * the mean dot is selected and the dot index otherwise */
   int * m_selectedDotIndex;
   int * m_selectedSeriesIndex;
+  Model::Type m_modelType[Store::k_numberOfSeries];
 };
 
 }