void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-07 15:43:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved out details dots above horizontal line captions.

Browse source
This commit is contained in:
23rd 2023-07-11 02:24:02 +03:00 • committed by John Preston
parent 487dd27ca1
commit f76f69b5cd
4 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Telegram/SourceFiles/statistics/chart_widget.cpp
View file

@ -646,6 +646,11 @@ void ChartWidget::setupChartArea() {
} }
} }
auto detailsPaintContext = DetailsPaintContext{
.xIndex = (_details.widget && (detailsAlpha > 0.))
? _details.widget->xIndex()
: -1,
};
if (_chartData) { if (_chartData) {
Statistic::PaintLinearChartView( Statistic::PaintLinearChartView(
p, p,
@ -653,16 +658,25 @@ void ChartWidget::setupChartArea() {
_animationController.currentXLimits(), _animationController.currentXLimits(),
_animationController.currentHeightLimits(), _animationController.currentHeightLimits(),
chartRect, chartRect,
{ detailsPaintContext);
_details.widget ? _details.widget->xIndex() : -1,
detailsAlpha,
});
} }
for (auto &horizontalLine : _horizontalLines) { for (auto &horizontalLine : _horizontalLines) {
PaintCaptionsToHorizontalLines(p, horizontalLine, chartRect); PaintCaptionsToHorizontalLines(p, horizontalLine, chartRect);
} }
{
auto o = ScopedPainterOpacity(p, detailsAlpha);
for (const auto &dot : detailsPaintContext.dots) {
p.setBrush(st::boxBg);
p.setPen(QPen(dot.color, st::statisticsChartLineWidth));
const auto r = st::statisticsDetailsDotRadius;
auto hq = PainterHighQualityEnabler(p);
p.drawEllipse(dot.point, r, r);
}
}
p.setPen(st::boxTextFg);
PaintBottomLine( PaintBottomLine(
p, p,
_bottomLine.dates, _bottomLine.dates,
@ -750,6 +764,7 @@ void ChartWidget::setupFooter() {
auto p = QPainter(_footer.get()); auto p = QPainter(_footer.get());
if (_chartData) { if (_chartData) {
auto detailsPaintContext = DetailsPaintContext{ .xIndex = -1 };
p.fillRect(_footer->rect(), st::boxBg); p.fillRect(_footer->rect(), st::boxBg);
Statistic::PaintLinearChartView( Statistic::PaintLinearChartView(
p, p,
@ -757,7 +772,7 @@ void ChartWidget::setupFooter() {
fullXLimits, fullXLimits,
_footer->fullHeightLimits(), _footer->fullHeightLimits(),
_footer->rect(), _footer->rect(),
{}); detailsPaintContext);
} }
}, _footer->lifetime()); }, _footer->lifetime());

18
Telegram/SourceFiles/statistics/linear_chart_view.cpp
View file

@ -22,7 +22,7 @@ void PaintLinearChartView(
const Limits &xPercentageLimits, const Limits &xPercentageLimits,
const Limits &heightLimits, const Limits &heightLimits,
const QRect &rect, const QRect &rect,
const DetailsPaintContext &detailsPaintContext) { DetailsPaintContext &detailsPaintContext) {
const auto currentMinHeight = rect.y(); // const auto currentMinHeight = rect.y(); //
const auto currentMaxHeight = rect.height() + rect.y(); // const auto currentMaxHeight = rect.height() + rect.y(); //
@ -36,7 +36,6 @@ void PaintLinearChartView(
auto first = true; auto first = true;
auto chartPath = QPainterPath(); auto chartPath = QPainterPath();
auto detailsDotPoint = QPointF();
const auto startXIndex = chartData.findStartIndex( const auto startXIndex = chartData.findStartIndex(
xPercentageLimits.min); xPercentageLimits.min);
@ -59,9 +58,11 @@ void PaintLinearChartView(
const auto yPercentage = (line.y[i] - heightLimits.min) const auto yPercentage = (line.y[i] - heightLimits.min)
/ float64(heightLimits.max - heightLimits.min); / float64(heightLimits.max - heightLimits.min);
const auto yPoint = rect.y() + (1. - yPercentage) * rect.height(); const auto yPoint = rect.y() + (1. - yPercentage) * rect.height();
if ((i == detailsPaintContext.xIndex) if (i == detailsPaintContext.xIndex) {
&& detailsPaintContext.progress > 0.) { detailsPaintContext.dots.push_back({
detailsDotPoint = QPointF(xPoint, yPoint); QPointF(xPoint, yPoint),
line.color,
});
} }
if (first) { if (first) {
first = false; first = false;
@ -72,13 +73,6 @@ void PaintLinearChartView(
p.setPen(QPen(line.color, st::statisticsChartLineWidth)); p.setPen(QPen(line.color, st::statisticsChartLineWidth));
p.setBrush(Qt::NoBrush); p.setBrush(Qt::NoBrush);
p.drawPath(chartPath); p.drawPath(chartPath);
if (!detailsDotPoint.isNull()) {
ScopedPainterOpacity o(p, detailsPaintContext.progress);
p.setBrush(st::boxBg);
const auto r = st::statisticsDetailsDotRadius;
p.drawEllipse(detailsDotPoint, r, r);
}
} }
p.setPen(st::boxTextFg); p.setPen(st::boxTextFg);
} }

2
Telegram/SourceFiles/statistics/linear_chart_view.h
View file

@ -22,6 +22,6 @@ void PaintLinearChartView(
const Limits &xPercentageLimits, const Limits &xPercentageLimits,
const Limits &heightLimits, const Limits &heightLimits,
const QRect &rect, const QRect &rect,
const DetailsPaintContext &detailsPaintContext); DetailsPaintContext &detailsPaintContext);
} // namespace Statistic } // namespace Statistic

7
Telegram/SourceFiles/statistics/statistics_common.h
View file

@ -17,7 +17,12 @@ struct Limits final {
// Dot on line charts. // Dot on line charts.
struct DetailsPaintContext final { struct DetailsPaintContext final {
int xIndex = -1; int xIndex = -1;
float64 progress = 0.;
struct Dot {
QPointF point;
QColor color;
};
std::vector<Dot> dots;
}; };
} // namespace Statistic } // namespace Statistic