From c22754fa636d94149e717171fcd5d7ff484f27c9 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Wed, 12 Jun 2019 15:32:32 +0200 Subject: [PATCH] [apps/shared/curve_view] Make curveViewRange() method const --- apps/probability/law_curve_view.cpp | 2 +- apps/sequence/graph/graph_view.cpp | 2 +- apps/shared/curve_view.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/probability/law_curve_view.cpp b/apps/probability/law_curve_view.cpp index f2d34f077..adfb57e5b 100644 --- a/apps/probability/law_curve_view.cpp +++ b/apps/probability/law_curve_view.cpp @@ -48,7 +48,7 @@ float LawCurveView::EvaluateAtAbscissa(float abscissa, void * model, void * cont void LawCurveView::drawStandardNormal(KDContext * ctx, KDRect rect, float colorLowerBound, float colorUpperBound) const { // Save the previous curve view range LawCurveView * constCastedThis = const_cast(this); - CurveViewRange * previousRange = constCastedThis->curveViewRange(); + CurveViewRange * previousRange = curveViewRange(); // Draw a centered reduced normal curve NormalLaw n; diff --git a/apps/sequence/graph/graph_view.cpp b/apps/sequence/graph/graph_view.cpp index 1577b2e1d..c85c531be 100644 --- a/apps/sequence/graph/graph_view.cpp +++ b/apps/sequence/graph/graph_view.cpp @@ -22,7 +22,7 @@ void GraphView::drawRect(KDContext * ctx, KDRect rect) const { float rectXMax = pixelToFloat(Axis::Horizontal, rect.right() + k_externRectMargin); /* We draw a dot at every integer if WindowRange/Resolution < 1. Otherwise, * we draw a dot at every step where step is an integer wider than 1. */ - float windowRange = pixelToFloat(Axis::Horizontal, bounds().width()) - pixelToFloat(Axis::Horizontal, 0); + float windowRange = curveViewRange()->xMax() - curveViewRange()->xMin(); int step = std::ceil(windowRange/resolution()); for (int x = rectXMin; x < rectXMax; x += step) { float y = s->evaluateAtAbscissa((float)x, context()); diff --git a/apps/shared/curve_view.h b/apps/shared/curve_view.h index 1d745383c..25bd0ff4f 100644 --- a/apps/shared/curve_view.h +++ b/apps/shared/curve_view.h @@ -38,7 +38,7 @@ public: void setForceOkDisplay(bool force) { m_forceOkDisplay = force; } float resolution() const; protected: - CurveViewRange * curveViewRange() { return m_curveViewRange; } + CurveViewRange * curveViewRange() const { return m_curveViewRange; } void setCurveViewRange(CurveViewRange * curveViewRange); // Drawing methods virtual float samplingRatio() const;