diff --git a/apps/shared/memoized_curve_view_range.cpp b/apps/shared/memoized_curve_view_range.cpp index 56f464154..842b42ed2 100644 --- a/apps/shared/memoized_curve_view_range.cpp +++ b/apps/shared/memoized_curve_view_range.cpp @@ -15,30 +15,6 @@ MemoizedCurveViewRange::MemoizedCurveViewRange() : { } -float MemoizedCurveViewRange::xMin() { - return m_xMin; -} - -float MemoizedCurveViewRange::xMax() { - return m_xMax; -} - -float MemoizedCurveViewRange::yMin() { - return m_yMin; -} - -float MemoizedCurveViewRange::yMax() { - return m_yMax; -} - -float MemoizedCurveViewRange::xGridUnit() { - return m_xGridUnit; -} - -float MemoizedCurveViewRange::yGridUnit() { - return m_yGridUnit; -} - void MemoizedCurveViewRange::setXMin(float xMin) { if (std::isnan(xMin)) { return; @@ -79,7 +55,6 @@ void MemoizedCurveViewRange::setYMax(float yMax) { m_yMax = yMax; if (m_yMin >= m_yMax) { m_yMin = yMax - + std::pow(10.0f, std::floor(std::log10(std::fabs(yMax)))-1.0f); - } m_yGridUnit = computeGridUnit(Axis::Y, m_yMax - m_yMin); } diff --git a/apps/shared/memoized_curve_view_range.h b/apps/shared/memoized_curve_view_range.h index 3b013cdf1..a2cd9d5f0 100644 --- a/apps/shared/memoized_curve_view_range.h +++ b/apps/shared/memoized_curve_view_range.h @@ -9,12 +9,12 @@ class MemoizedCurveViewRange : public CurveViewRange { public: MemoizedCurveViewRange(); //CurveViewWindow - float xMin() override; - float xMax() override; - float yMin() override; - float yMax() override; - float xGridUnit() override; - float yGridUnit() override; + float xMin() override { return m_xMin; } + float xMax() override { return m_xMax; } + float yMin() override { return m_yMin; } + float yMax() override { return m_yMax; } + float xGridUnit() override { return m_xGridUnit; } + float yGridUnit() override { return m_yGridUnit; } virtual void setXMin(float f); virtual void setXMax(float f); virtual void setYMin(float f);