From 372e5c0ef156fd1b08869a53f65ed74f40d368e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Wed, 7 Dec 2016 12:37:13 +0100
Subject: [PATCH] [apps/probability] Reinit the calculation when arriving on
 calculation page

Change-Id: I9b28bcf86945ff286848a823e996630fb49feb89
---
 apps/probability/calculation_controller.cpp | 8 ++++++++
 apps/probability/calculation_controller.h   | 1 +
 apps/probability/parameters_controller.cpp  | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp
index 83bcdb17f..2de2587f8 100644
--- a/apps/probability/calculation_controller.cpp
+++ b/apps/probability/calculation_controller.cpp
@@ -182,7 +182,12 @@ bool CalculationController::handleEvent(Ion::Events::Event event) {
 
 void CalculationController::didBecomeFirstResponder() {
   m_contentView.layoutSubviews();
+  for (int subviewIndex = 0; subviewIndex < 2; subviewIndex++) {
+    EditableTextCell * calculCell = m_contentView.calculationCellAtIndex(subviewIndex);
+    calculCell->setHighlighted(false);
+  }
   if (m_highlightedSubviewIndex > 0) {
+    m_contentView.imageTableView()->setHighlight(false);
     EditableTextCell * calculCell = m_contentView.calculationCellAtIndex(m_highlightedSubviewIndex-1);
     calculCell->setHighlighted(true);
   } else {
@@ -199,5 +204,8 @@ int CalculationController::highlightedSubviewIndex() const {
   return m_highlightedSubviewIndex;
 }
 
+void CalculationController::selectSubview(int subviewIndex) {
+  m_highlightedSubviewIndex = subviewIndex;
+}
 
 }
diff --git a/apps/probability/calculation_controller.h b/apps/probability/calculation_controller.h
index b1d61fdc8..5b2525209 100644
--- a/apps/probability/calculation_controller.h
+++ b/apps/probability/calculation_controller.h
@@ -17,6 +17,7 @@ public:
   void didBecomeFirstResponder() override;
   Law * law();
   int highlightedSubviewIndex() const;
+  void selectSubview(int subviewIndex);
 private:
   class ContentView : public View {
   public:
diff --git a/apps/probability/parameters_controller.cpp b/apps/probability/parameters_controller.cpp
index 646849c07..552427623 100644
--- a/apps/probability/parameters_controller.cpp
+++ b/apps/probability/parameters_controller.cpp
@@ -8,9 +8,13 @@ namespace Probability {
 ParametersController::ContentView::ContentView(Responder * parentResponder, SelectableTableView * selectableTableView) :
   m_nextButton(Button(parentResponder, "Suivant", Invocation([](void * context, void * sender) {
     ParametersController * parameterController = (ParametersController *) context;
+    CalculationController * calculationController = parameterController->calculationController();
+    calculationController->selectSubview(1);
+    Law * law = calculationController->law();
+    law->setCalculationType(Law::CalculationType::LeftIntegral);
     StackViewController * stack = parameterController->stackController();
     stack->updateTitle();
-    stack->push(parameterController->calculationController());
+    stack->push(calculationController);
   }, parentResponder))),
   m_firstParameterDefinition(PointerTextView(nullptr, 0.5f, 0.5f, KDColorBlack, Palette::BackgroundColor)),
   m_secondParameterDefinition(PointerTextView(nullptr, 0.5f, 0.5f, KDColorBlack, Palette::BackgroundColor)),