From 9e8d60065bfee67dce258f516ee3b3847d4a966d Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 1 Jul 2023 12:21:23 +0300 Subject: [PATCH] Slightly improved code style in PaintLinearChartView. --- .../statistics/linear_chart_view.cpp | 21 +++++++------------ .../statistics/linear_chart_view.h | 4 ++-- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Telegram/SourceFiles/statistics/linear_chart_view.cpp b/Telegram/SourceFiles/statistics/linear_chart_view.cpp index f3e37696b9..a841f0738e 100644 --- a/Telegram/SourceFiles/statistics/linear_chart_view.cpp +++ b/Telegram/SourceFiles/statistics/linear_chart_view.cpp @@ -17,15 +17,12 @@ namespace Statistic { void PaintLinearChartView( QPainter &p, const Data::StatisticalChart &chartData, - const Limits &xPercentageLimitsNow, - const Limits &xPercentageLimitsNowY, + const Limits &xPercentageLimits, + const Limits &heightLimits, const QRect &rect) { - const auto offset = 0; const auto currentMinHeight = rect.y(); // const auto currentMaxHeight = rect.height() + rect.y(); // - const auto xPercentageLimits = xPercentageLimitsNow; - for (const auto &line : chartData.lines) { const auto additionalP = (chartData.xPercentage.size() < 2) ? 0. @@ -46,19 +43,15 @@ void PaintLinearChartView( int(chartData.xPercentage.size() - 1), endXIndex + additionalPoints); - auto minY = std::numeric_limits::max(); - auto maxY = 0.; - minY = xPercentageLimitsNowY.min; - maxY = xPercentageLimitsNowY.max; - for (auto i = localStart; i <= localEnd; i++) { if (line.y[i] < 0) { continue; } - const auto xPoint = ((chartData.xPercentage[i] - xPercentageLimits.min) / (xPercentageLimits.max - xPercentageLimits.min)) * rect.width() - - offset; - const auto yPercentage = (line.y[i] - minY) - / float64(maxY - minY); + const auto xPoint = rect.width() + * ((chartData.xPercentage[i] - xPercentageLimits.min) + / (xPercentageLimits.max - xPercentageLimits.min)); + const auto yPercentage = (line.y[i] - heightLimits.min) + / float64(heightLimits.max - heightLimits.min); const auto yPoint = rect.y() + (1. - yPercentage) * rect.height(); if (first) { first = false; diff --git a/Telegram/SourceFiles/statistics/linear_chart_view.h b/Telegram/SourceFiles/statistics/linear_chart_view.h index 0df042e285..52b6e91b4c 100644 --- a/Telegram/SourceFiles/statistics/linear_chart_view.h +++ b/Telegram/SourceFiles/statistics/linear_chart_view.h @@ -18,8 +18,8 @@ struct Limits; void PaintLinearChartView( QPainter &p, const Data::StatisticalChart &chartData, - const Limits &xPercentageLimitsNow, - const Limits &xPercentageLimitsNowY, + const Limits &xPercentageLimits, + const Limits &heightLimits, const QRect &rect); } // namespace Statistic