From 00bb1b7ac1c1caaef3ef3116afb0ebc756fe52ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Tue, 24 Sep 2019 17:32:42 +0200
Subject: [PATCH] [apps/graph] ValuesController: column width are different for
 parametric functions

---
 apps/graph/values/values_controller.cpp    | 16 +++++++++++++++
 apps/graph/values/values_controller.h      |  4 ++++
 apps/sequence/values/values_controller.cpp | 24 ++++++++++++++++++++++
 apps/sequence/values/values_controller.h   |  5 +++++
 apps/shared/values_controller.cpp          | 24 ----------------------
 apps/shared/values_controller.h            |  5 -----
 6 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp
index b3e5efff9..6d9c000a6 100644
--- a/apps/graph/values/values_controller.cpp
+++ b/apps/graph/values/values_controller.cpp
@@ -42,6 +42,22 @@ ValuesController::ValuesController(Responder * parentResponder, InputEventHandle
   m_selectableTableView.setDelegate(this);
 }
 
+KDCoordinate ValuesController::columnWidth(int i) {
+  ContinuousFunction::PlotType plotType = plotTypeAtColumn(&i);
+  if (i > 0 && plotType == ContinuousFunction::PlotType::Parametric) {
+    return 2*k_cellWidth;
+  }
+  return k_cellWidth;
+}
+
+KDCoordinate ValuesController::cumulatedWidthFromIndex(int i) {
+  return TableViewDataSource::cumulatedWidthFromIndex(i);
+}
+
+int ValuesController::indexFromCumulatedWidth(KDCoordinate offsetX) {
+  return TableViewDataSource::indexFromCumulatedWidth(offsetX);
+}
+
 Shared::Hideable * ValuesController::hideableCellFromType(HighlightCell * cell, int type) {
   if (type == k_notEditableValueCellType) {
     Shared::HideableEvenOddBufferTextCell * myCell = static_cast<Shared::HideableEvenOddBufferTextCell *>(cell);
diff --git a/apps/graph/values/values_controller.h b/apps/graph/values/values_controller.h
index 6320329ac..95da02dc2 100644
--- a/apps/graph/values/values_controller.h
+++ b/apps/graph/values/values_controller.h
@@ -20,6 +20,9 @@ public:
   Button * buttonAtIndex(int index, ButtonRowController::Position position) const override {
     return const_cast<Button *>(&m_setIntervalButton);
   }
+  KDCoordinate columnWidth(int i) override;
+  KDCoordinate cumulatedWidthFromIndex(int i) override;
+  int indexFromCumulatedWidth(KDCoordinate offsetX) override;
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
   int typeAtLocation(int i, int j) override;
   I18n::Message emptyMessage() override;
@@ -31,6 +34,7 @@ public:
   }
   void tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY, bool withinTemporarySelection = false) override;
 private:
+  static constexpr KDCoordinate k_cellWidth = 100;
   constexpr static int k_maxNumberOfFunctions = 5;
   constexpr static int k_maxNumberOfAbscissaCells = Shared::ContinuousFunction::k_numberOfPlotTypes * k_maxNumberOfRows;
   constexpr static int k_maxNumberOfCells = k_maxNumberOfFunctions * k_maxNumberOfRows;
diff --git a/apps/sequence/values/values_controller.cpp b/apps/sequence/values/values_controller.cpp
index f14c8f0d3..e3c02b06c 100644
--- a/apps/sequence/values/values_controller.cpp
+++ b/apps/sequence/values/values_controller.cpp
@@ -31,6 +31,30 @@ ValuesController::ValuesController(Responder * parentResponder, InputEventHandle
   setupAbscissaCellsAndTitleCells(inputEventHandlerDelegate);
 }
 
+KDCoordinate ValuesController::columnWidth(int i) {
+  switch (i) {
+    case 0:
+      return k_abscissaCellWidth;
+    default:
+      return k_ordinateCellWidth;
+  }
+}
+
+KDCoordinate ValuesController::cumulatedWidthFromIndex(int i) {
+  if (i == 0) {
+    return 0;
+  } else {
+    return k_abscissaCellWidth + (i-1)*k_ordinateCellWidth;
+  }
+}
+
+int ValuesController::indexFromCumulatedWidth(KDCoordinate offsetX) {
+  if (offsetX <= k_abscissaCellWidth) {
+    return 0;
+  }
+  return (offsetX - k_abscissaCellWidth)/k_ordinateCellWidth+1;
+}
+
 void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {
   Shared::ValuesController::willDisplayCellAtLocation(cell, i, j);
   if (typeAtLocation(i,j) == k_abscissaTitleCellType) {
diff --git a/apps/sequence/values/values_controller.h b/apps/sequence/values/values_controller.h
index d29037e43..f4db4b8d9 100644
--- a/apps/sequence/values/values_controller.h
+++ b/apps/sequence/values/values_controller.h
@@ -14,12 +14,17 @@ public:
   Button * buttonAtIndex(int index, ButtonRowController::Position position) const override {
     return const_cast<Button *>(&m_setIntervalButton);
   }
+  KDCoordinate columnWidth(int i) override;
+  KDCoordinate cumulatedWidthFromIndex(int i) override;
+  int indexFromCumulatedWidth(KDCoordinate offsetX) override;
   void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
   I18n::Message emptyMessage() override;
   IntervalParameterController * intervalParameterController() override {
     return &m_intervalParameterController;
   }
 private:
+  static constexpr KDCoordinate k_abscissaCellWidth = 100;
+  static constexpr KDCoordinate k_ordinateCellWidth = 100;
   void setStartEndMessages(Shared::IntervalParameterController * controller, int column) override;
   bool setDataAtLocation(double floatBody, int columnIndex, int rowIndex) override;
   void printEvaluationOfAbscissaAtColumn(double abscissa, int columnIndex, char * buffer, const int bufferSize) override;
diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index 7b505ad87..cb1f85ff8 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -136,30 +136,6 @@ void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, in
   }
 }
 
-KDCoordinate ValuesController::columnWidth(int i) {
-  switch (i) {
-    case 0:
-      return k_abscissaCellWidth;
-    default:
-      return k_ordinateCellWidth;
-  }
-}
-
-KDCoordinate ValuesController::cumulatedWidthFromIndex(int i) {
-  if (i == 0) {
-    return 0;
-  } else {
-    return k_abscissaCellWidth + (i-1)*k_ordinateCellWidth;
-  }
-}
-
-int ValuesController::indexFromCumulatedWidth(KDCoordinate offsetX) {
-  if (offsetX <= k_abscissaCellWidth) {
-    return 0;
-  }
-  return (offsetX - k_abscissaCellWidth)/k_ordinateCellWidth+1;
-}
-
 HighlightCell * ValuesController::reusableCell(int index, int type) {
   assert(0 <= index && index < reusableCellCount(type));
   switch (type) {
diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h
index 0d9a60a96..fd9c82a95 100644
--- a/apps/shared/values_controller.h
+++ b/apps/shared/values_controller.h
@@ -24,9 +24,6 @@ public:
   virtual IntervalParameterController * intervalParameterController() = 0;
   int numberOfButtons(ButtonRowController::Position) const override;
   virtual void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
-  KDCoordinate columnWidth(int i) override;
-  KDCoordinate cumulatedWidthFromIndex(int i) override;
-  int indexFromCumulatedWidth(KDCoordinate offsetX) override;
   HighlightCell * reusableCell(int index, int type) override;
   int reusableCellCount(int type) override;
   int typeAtLocation(int i, int j) override;
@@ -34,8 +31,6 @@ public:
   Responder * defaultController() override;
   void viewWillAppear() override;
   void viewDidDisappear() override;
-  static constexpr KDCoordinate k_abscissaCellWidth = 108;
-  static constexpr KDCoordinate k_ordinateCellWidth = 108;
 
 protected:
   static constexpr int k_abscissaTitleCellType = 0;