From b7346c203a35475291f6d9683217b79117929680 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 17 Nov 2023 02:41:36 +0300 Subject: [PATCH] Renamed StackChartView to BarChartView. --- ...tack_chart_view.cpp => bar_chart_view.cpp} | 20 +++++++++---------- .../{stack_chart_view.h => bar_chart_view.h} | 6 +++--- .../statistics/view/chart_view_factory.cpp | 4 ++-- Telegram/cmake/td_ui.cmake | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) rename Telegram/SourceFiles/statistics/view/{stack_chart_view.cpp => bar_chart_view.cpp} (90%) rename Telegram/SourceFiles/statistics/view/{stack_chart_view.h => bar_chart_view.h} (92%) diff --git a/Telegram/SourceFiles/statistics/view/stack_chart_view.cpp b/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp similarity index 90% rename from Telegram/SourceFiles/statistics/view/stack_chart_view.cpp rename to Telegram/SourceFiles/statistics/view/bar_chart_view.cpp index d6a93914b7..0b410c163a 100644 --- a/Telegram/SourceFiles/statistics/view/stack_chart_view.cpp +++ b/Telegram/SourceFiles/statistics/view/bar_chart_view.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "statistics/view/stack_chart_view.h" +#include "statistics/view/bar_chart_view.h" #include "data/data_statistics_chart.h" #include "statistics/chart_lines_filter_controller.h" @@ -15,10 +15,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Statistic { -StackChartView::StackChartView() = default; -StackChartView::~StackChartView() = default; +BarChartView::BarChartView() = default; +BarChartView::~BarChartView() = default; -void StackChartView::paint(QPainter &p, const PaintContext &c) { +void BarChartView::paint(QPainter &p, const PaintContext &c) { constexpr auto kOffset = float64(2); _lastPaintedXIndices = { float64(std::max(0., c.xIndices.min - kOffset)), @@ -27,10 +27,10 @@ void StackChartView::paint(QPainter &p, const PaintContext &c) { c.xIndices.max + kOffset)), }; - StackChartView::paintChartAndSelected(p, c); + BarChartView::paintChartAndSelected(p, c); } -void StackChartView::paintChartAndSelected( +void BarChartView::paintChartAndSelected( QPainter &p, const PaintContext &c) { const auto &[localStart, localEnd] = _lastPaintedXIndices; @@ -105,7 +105,7 @@ void StackChartView::paintChartAndSelected( } } -void StackChartView::paintSelectedXIndex( +void BarChartView::paintSelectedXIndex( QPainter &p, const PaintContext &c, int selectedXIndex, @@ -114,11 +114,11 @@ void StackChartView::paintSelectedXIndex( _lastSelectedXIndex = selectedXIndex; _lastSelectedXProgress = progress; if ((_lastSelectedXIndex >= 0) || (was >= 0)) { - StackChartView::paintChartAndSelected(p, c); + BarChartView::paintChartAndSelected(p, c); } } -int StackChartView::findXIndexByPosition( +int BarChartView::findXIndexByPosition( const Data::StatisticalChart &chartData, const Limits &xPercentageLimits, const QRect &rect, @@ -144,7 +144,7 @@ int StackChartView::findXIndexByPosition( return _lastSelectedXIndex = -1; } -AbstractChartView::HeightLimits StackChartView::heightLimits( +AbstractChartView::HeightLimits BarChartView::heightLimits( Data::StatisticalChart &chartData, Limits xIndices) { _cachedHeightLimits = {}; diff --git a/Telegram/SourceFiles/statistics/view/stack_chart_view.h b/Telegram/SourceFiles/statistics/view/bar_chart_view.h similarity index 92% rename from Telegram/SourceFiles/statistics/view/stack_chart_view.h rename to Telegram/SourceFiles/statistics/view/bar_chart_view.h index 221c318a44..a274c2f752 100644 --- a/Telegram/SourceFiles/statistics/view/stack_chart_view.h +++ b/Telegram/SourceFiles/statistics/view/bar_chart_view.h @@ -20,10 +20,10 @@ namespace Statistic { struct Limits; -class StackChartView final : public AbstractChartView { +class BarChartView final : public AbstractChartView { public: - StackChartView(); - ~StackChartView() override final; + BarChartView(); + ~BarChartView() override final; void paint(QPainter &p, const PaintContext &c) override; diff --git a/Telegram/SourceFiles/statistics/view/chart_view_factory.cpp b/Telegram/SourceFiles/statistics/view/chart_view_factory.cpp index dd8e4d1ce3..1a7566c00b 100644 --- a/Telegram/SourceFiles/statistics/view/chart_view_factory.cpp +++ b/Telegram/SourceFiles/statistics/view/chart_view_factory.cpp @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "statistics/statistics_common.h" #include "statistics/view/linear_chart_view.h" -#include "statistics/view/stack_chart_view.h" +#include "statistics/view/bar_chart_view.h" #include "statistics/view/stack_linear_chart_view.h" namespace Statistic { @@ -20,7 +20,7 @@ std::unique_ptr CreateChartView(ChartViewType type) { return std::make_unique(false); } break; case ChartViewType::Stack: { - return std::make_unique(); + return std::make_unique(); } break; case ChartViewType::DoubleLinear: { return std::make_unique(true); diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake index 7ec4ac6f9e..c1f62e06c1 100644 --- a/Telegram/cmake/td_ui.cmake +++ b/Telegram/cmake/td_ui.cmake @@ -185,6 +185,8 @@ PRIVATE statistics/statistics_data_deserialize.h statistics/view/abstract_chart_view.cpp statistics/view/abstract_chart_view.h + statistics/view/bar_chart_view.cpp + statistics/view/bar_chart_view.h statistics/view/chart_rulers_view.cpp statistics/view/chart_rulers_view.h statistics/view/chart_view_factory.cpp @@ -193,8 +195,6 @@ PRIVATE statistics/view/linear_chart_view.h statistics/view/stack_chart_common.cpp statistics/view/stack_chart_common.h - statistics/view/stack_chart_view.cpp - statistics/view/stack_chart_view.h statistics/view/stack_linear_chart_common.cpp statistics/view/stack_linear_chart_common.h statistics/view/stack_linear_chart_view.cpp