From 771e0f7c0f73d9a89c13328297a28e2fa055889d Mon Sep 17 00:00:00 2001
From: Ruben Dashyan <ruben.dashyan@numworks.com>
Date: Mon, 10 Jun 2019 15:48:57 +0200
Subject: [PATCH] [apps] Simplify Shared::CurveViewRange::x|yGridUnit()

---
 apps/probability/law/law.cpp     | 4 ----
 apps/probability/law/law.h       | 1 -
 apps/shared/curve_view_range.cpp | 4 ----
 apps/shared/curve_view_range.h   | 4 ++--
 apps/statistics/box_range.cpp    | 4 ----
 apps/statistics/box_range.h      | 1 -
 6 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/apps/probability/law/law.cpp b/apps/probability/law/law.cpp
index 73404865b..d4c3c39fb 100644
--- a/apps/probability/law/law.cpp
+++ b/apps/probability/law/law.cpp
@@ -4,10 +4,6 @@
 
 namespace Probability {
 
-float Law::xGridUnit() {
-  return computeGridUnit(Axis::X, xMax() - xMin());
-}
-
 double Law::cumulativeDistributiveFunctionAtAbscissa(double x) const {
   if (!isContinuous()) {
     int end = std::round(x);
diff --git a/apps/probability/law/law.h b/apps/probability/law/law.h
index fefc8d23d..84c9c05c2 100644
--- a/apps/probability/law/law.h
+++ b/apps/probability/law/law.h
@@ -22,7 +22,6 @@ public:
   virtual I18n::Message title() = 0;
   virtual Type type() const = 0;
   virtual bool isContinuous() const = 0;
-  float xGridUnit() override;
   virtual int numberOfParameter() = 0;
   virtual float parameterValueAtIndex(int index) = 0;
   virtual I18n::Message parameterNameAtIndex(int index) = 0;
diff --git a/apps/shared/curve_view_range.cpp b/apps/shared/curve_view_range.cpp
index d22a9ad02..c3807a254 100644
--- a/apps/shared/curve_view_range.cpp
+++ b/apps/shared/curve_view_range.cpp
@@ -15,10 +15,6 @@ uint32_t CurveViewRange::rangeChecksum() {
   return Ion::crc32Word((uint32_t *)data, dataLengthInBytes/sizeof(uint32_t));
 }
 
-float CurveViewRange::yGridUnit() {
-  return 0.0f;
-}
-
 float CurveViewRange::computeGridUnit(Axis axis, float range) {
   int a = 0;
   int b = 0;
diff --git a/apps/shared/curve_view_range.h b/apps/shared/curve_view_range.h
index f72b0eb6b..9a487037b 100644
--- a/apps/shared/curve_view_range.h
+++ b/apps/shared/curve_view_range.h
@@ -17,8 +17,8 @@ public:
   virtual float xMax() = 0;
   virtual float yMin() = 0;
   virtual float yMax() = 0;
-  virtual float xGridUnit() = 0;
-  virtual float yGridUnit();
+  virtual float xGridUnit() { return computeGridUnit(Axis::X, xMax() - xMin()); }
+  virtual float yGridUnit() { return 0.0f; }
   float computeGridUnit(Axis axis, float range);
   constexpr static float k_maxNumberOfXGridUnits = 18.0f;
   constexpr static float k_maxNumberOfYGridUnits = 13.0f;
diff --git a/apps/statistics/box_range.cpp b/apps/statistics/box_range.cpp
index 1307acaf1..9a4c8deb2 100644
--- a/apps/statistics/box_range.cpp
+++ b/apps/statistics/box_range.cpp
@@ -21,8 +21,4 @@ float BoxRange::xMax() {
   return max + k_displayRightMarginRatio*(max - min);
 }
 
-float BoxRange::xGridUnit() {
-  return computeGridUnit(Axis::X, xMax() - xMin());
-}
-
 }
diff --git a/apps/statistics/box_range.h b/apps/statistics/box_range.h
index 22ddcc636..b43f31114 100644
--- a/apps/statistics/box_range.h
+++ b/apps/statistics/box_range.h
@@ -13,7 +13,6 @@ public:
   float xMax() override;
   float yMin() override { return -k_displayBottomMarginRatio; }
   float yMax() override { return 1.0f+k_displayTopMarginRatio; }
-  float xGridUnit() override;
 private:
   constexpr static float k_displayTopMarginRatio = 0.05f;
   constexpr static float k_displayRightMarginRatio = 0.2f;