RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved out calculation of height limits for linear chart to single place.

This commit is contained in:
23rd 2023-11-17 03:20:23 +03:00 committed by John Preston
parent 5ea066e6a7
commit c3254a53bc
3 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Telegram/SourceFiles/statistics/view/abstract_chart_view.cpp
View File

@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "statistics/view/abstract_chart_view.h"
#include "data/data_statistics_chart.h"
#include "statistics/chart_lines_filter_controller.h"
namespace Statistic {
@ -65,4 +66,37 @@ auto AbstractChartView::linesFilterController() const
return _linesFilterController;
}
AbstractChartView::HeightLimits DefaultHeightLimits(
const DoubleLineRatios &ratios,
const std::shared_ptr<LinesFilterController> &linesFilter,
Data::StatisticalChart &chartData,
Limits xIndices) {
auto minValue = std::numeric_limits<int>::max();
auto maxValue = 0;
auto minValueFull = std::numeric_limits<int>::max();
auto maxValueFull = 0;
for (auto &l : chartData.lines) {
if (!linesFilter->isEnabled(l.id)) {
continue;
}
const auto r = ratios.ratio(l.id);
const auto lineMax = l.segmentTree.rMaxQ(xIndices.min, xIndices.max);
const auto lineMin = l.segmentTree.rMinQ(xIndices.min, xIndices.max);
maxValue = std::max(int(lineMax * r), maxValue);
minValue = std::min(int(lineMin * r), minValue);
maxValueFull = std::max(int(l.maxValue * r), maxValueFull);
minValueFull = std::min(int(l.minValue * r), minValueFull);
}
if (maxValue == minValue) {
maxValue = chartData.maxValue;
minValue = chartData.minValue;
}
return {
.full = Limits{ float64(minValueFull), float64(maxValueFull) },
.ranged = Limits{ float64(minValue), float64(maxValue) },
};
}
} // namespace Statistic

6
Telegram/SourceFiles/statistics/view/abstract_chart_view.h
View File

@ -118,4 +118,10 @@ private:
};
AbstractChartView::HeightLimits DefaultHeightLimits(
const DoubleLineRatios &ratios,
const std::shared_ptr<LinesFilterController> &linesFilter,
Data::StatisticalChart &chartData,
Limits xIndices);
} // namespace Statistic

31
Telegram/SourceFiles/statistics/view/linear_chart_view.cpp
View File

@ -214,32 +214,11 @@ AbstractChartView::HeightLimits LinearChartView::heightLimits(
_cachedLineRatios.init(chartData);
}
auto minValue = std::numeric_limits<int>::max();
auto maxValue = 0;
auto minValueFull = std::numeric_limits<int>::max();
auto maxValueFull = 0;
for (auto &l : chartData.lines) {
if (!linesFilterController()->isEnabled(l.id)) {
continue;
}
const auto r = _cachedLineRatios.ratio(l.id);
const auto lineMax = l.segmentTree.rMaxQ(xIndices.min, xIndices.max);
const auto lineMin = l.segmentTree.rMinQ(xIndices.min, xIndices.max);
maxValue = std::max(int(lineMax * r), maxValue);
minValue = std::min(int(lineMin * r), minValue);
maxValueFull = std::max(int(l.maxValue * r), maxValueFull);
minValueFull = std::min(int(l.minValue * r), minValueFull);
}
if (maxValue == minValue) {
maxValue = chartData.maxValue;
minValue = chartData.minValue;
}
return {
.full = Limits{ float64(minValueFull), float64(maxValueFull) },
.ranged = Limits{ float64(minValue), float64(maxValue) },
};
return DefaultHeightLimits(
_cachedLineRatios,
linesFilterController(),
chartData,
xIndices);
}
} // namespace Statistic