diff --git a/apps/regression/graph_controller.cpp b/apps/regression/graph_controller.cpp index 9e56ce98d..aad2a78e5 100644 --- a/apps/regression/graph_controller.cpp +++ b/apps/regression/graph_controller.cpp @@ -366,23 +366,6 @@ int GraphController::estimatedBannerNumberOfLines() const { return (selectedSeriesIndex() < 0) ? 3 : m_store->modelForSeries(selectedSeriesIndex())->bannerLinesCount(); } -InteractiveCurveViewRangeDelegate::Range GraphController::computeYRange(InteractiveCurveViewRange * interactiveCurveViewRange) { - float minY = FLT_MAX; - float maxY = -FLT_MAX; - for (int series = 0; series < Store::k_numberOfSeries; series++) { - for (int k = 0; k < m_store->numberOfPairsOfSeries(series); k++) { - if (m_store->xMin() <= m_store->get(series, 0, k) && m_store->get(series, 0, k) <= m_store->xMax()) { - minY = std::min(minY, m_store->get(series, 1, k)); - maxY = std::max(maxY, m_store->get(series, 1, k)); - } - } - } - InteractiveCurveViewRangeDelegate::Range range; - range.min = minY; - range.max = maxY; - return range; -} - void GraphController::setRoundCrossCursorView() { /* At this point, the model (selected series and dot indices) should be up * to date. */ diff --git a/apps/regression/graph_controller.h b/apps/regression/graph_controller.h index fbe9b121c..4adf50f9c 100644 --- a/apps/regression/graph_controller.h +++ b/apps/regression/graph_controller.h @@ -49,9 +49,6 @@ private: int numberOfCurves() const override; int estimatedBannerNumberOfLines() const override; - // InteractiveCurveViewRangeDelegate - Shared::InteractiveCurveViewRangeDelegate::Range computeYRange(Shared::InteractiveCurveViewRange * interactiveCurveViewRange) override; - void setRoundCrossCursorView(); Shared::CursorView m_crossCursorView; Shared::RoundCursorView m_roundCursorView; diff --git a/apps/shared/function_graph_controller.cpp b/apps/shared/function_graph_controller.cpp index 869de86b8..7f6bf66d7 100644 --- a/apps/shared/function_graph_controller.cpp +++ b/apps/shared/function_graph_controller.cpp @@ -140,12 +140,6 @@ void FunctionGraphController::interestingRanges(InteractiveCurveViewRange * rang privateComputeRanges(true, range); } -Shared::InteractiveCurveViewRangeDelegate::Range FunctionGraphController::computeYRange(Shared::InteractiveCurveViewRange * interactiveCurveViewRange) { - InteractiveCurveViewRange tempRange = *interactiveCurveViewRange; - privateComputeRanges(false, &tempRange); - return Shared::InteractiveCurveViewRangeDelegate::Range{.min = tempRange.yMin(), .max = tempRange.yMax()}; -} - void FunctionGraphController::privateComputeRanges(bool tuneXRange, InteractiveCurveViewRange * range) const { Poincare::Context * context = textFieldDelegateApp()->localContext(); float resultXMin = tuneXRange ? FLT_MAX : range->xMin(); diff --git a/apps/shared/function_graph_controller.h b/apps/shared/function_graph_controller.h index fca17d753..9605564d8 100644 --- a/apps/shared/function_graph_controller.h +++ b/apps/shared/function_graph_controller.h @@ -39,7 +39,6 @@ protected: void initCursorParameters() override; CurveView * curveView() override; - Range computeYRange(Shared::InteractiveCurveViewRange * interactiveCurveViewRange) override; void privateComputeRanges(bool tuneXRange, Shared::InteractiveCurveViewRange * range) const; void yRangeForCursorFirstMove(Shared::InteractiveCurveViewRange * range) const; diff --git a/apps/shared/interactive_curve_view_range_delegate.h b/apps/shared/interactive_curve_view_range_delegate.h index e5c05a921..bd9f07dcc 100644 --- a/apps/shared/interactive_curve_view_range_delegate.h +++ b/apps/shared/interactive_curve_view_range_delegate.h @@ -20,8 +20,6 @@ protected: float min; float max; }; -private: - virtual Range computeYRange(InteractiveCurveViewRange * interactiveCurveViewRange) = 0; }; }