From 682fa3f294ec248bc923bd20796c8e88344bfb03 Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Tue, 2 Apr 2019 12:06:21 +0200
Subject: [PATCH] [apps/graph/graph] CalculationParameterController inherits
 from ListViewDataSource

instead of SimpleListViewDataSource
---
 .../graph/graph/calculation_parameter_controller.cpp | 12 ++++++++----
 apps/graph/graph/calculation_parameter_controller.h  |  9 +++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/graph/graph/calculation_parameter_controller.cpp b/apps/graph/graph/calculation_parameter_controller.cpp
index cd5bb5877..259a916f5 100644
--- a/apps/graph/graph/calculation_parameter_controller.cpp
+++ b/apps/graph/graph/calculation_parameter_controller.cpp
@@ -82,19 +82,23 @@ int CalculationParameterController::numberOfRows() {
   return k_totalNumberOfCells;
 };
 
+KDCoordinate CalculationParameterController::rowHeight(int j) {
+  return Metric::ParameterCellHeight;
+}
 
-HighlightCell * CalculationParameterController::reusableCell(int index) {
+HighlightCell * CalculationParameterController::reusableCell(int index, int type) {
   assert(index >= 0);
   assert(index < k_totalNumberOfCells);
   return &m_cells[index];
 }
 
-int CalculationParameterController::reusableCellCount() {
+int CalculationParameterController::reusableCellCount(int type) {
   return k_totalNumberOfCells;
 }
 
-KDCoordinate CalculationParameterController::cellHeight() {
-  return Metric::ParameterCellHeight;
+int CalculationParameterController::typeAtLocation(int i, int j) {
+  assert(i == 0);
+  return 0;
 }
 
 void CalculationParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
diff --git a/apps/graph/graph/calculation_parameter_controller.h b/apps/graph/graph/calculation_parameter_controller.h
index 77b1cac88..9e55126d7 100644
--- a/apps/graph/graph/calculation_parameter_controller.h
+++ b/apps/graph/graph/calculation_parameter_controller.h
@@ -14,7 +14,7 @@
 
 namespace Graph {
 
-class CalculationParameterController : public ViewController, public SimpleListViewDataSource, public SelectableTableViewDataSource {
+class CalculationParameterController : public ViewController, public ListViewDataSource, public SelectableTableViewDataSource {
 public:
   CalculationParameterController(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, GraphView * graphView, BannerView * bannerView, Shared::InteractiveCurveViewRange * range, Shared::CurveViewCursor * cursor);
   View * view() override;
@@ -22,9 +22,10 @@ public:
   bool handleEvent(Ion::Events::Event event) override;
   void didBecomeFirstResponder() override;
   int numberOfRows() override;
-  KDCoordinate cellHeight() override;
-  HighlightCell * reusableCell(int index) override;
-  int reusableCellCount() override;
+  KDCoordinate rowHeight(int j) override;
+  HighlightCell * reusableCell(int index, int type) override;
+  int reusableCellCount(int type) override;
+  int typeAtLocation(int i, int j) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
   void setRecord(Ion::Storage::Record record);
 private: