nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

User PIE and BAR Charts honor x-axis Date and Time settings

Browse Source 
So labels/categories are displayed in Time/Date format
in a similar way to Line and Scatter charts.
This commit is contained in:
Ale Martinez
2021-01-13 20:30:26 -03:00
parent 1120704073
commit 1d4e93350a
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Charts/UserChart.cpp
View File

@@ -28,6 +28,7 @@
#include "ColorButton.h"
#include "MainWindow.h"
#include "UserChartData.h"
#include "TimeUtils.h"
#include <limits>
#include <QScrollArea>
@@ -170,8 +171,24 @@ UserChart::setRide(RideItem *item)
// pie charts need labels
if (chartinfo.type == GC_CHART_PIE) {
series.labels.clear();
for(int i=0; i<ucd->x.asString().count(); i++) series.labels << ucd->x.asString()[i];
foreach (GenericAxisInfo axis, axisinfo) {
if (series.xname == axis.name) {
// DATERANGE values are days from 01-01-1900
QDateTime earliest(QDate(1900,01,01), QTime(0,0,0), Qt::LocalTime);
switch (axis.type) {
case GenericAxisInfo::TIME:
for(int i=0; i<ucd->x.asNumeric().count(); i++) series.labels << time_to_string(ucd->x.asNumeric()[i], true);
break;
case GenericAxisInfo::DATERANGE:
for(int i=0; i<ucd->x.asNumeric().count(); i++) series.labels << earliest.addDays(ucd->x.asNumeric()[i]).toString("dd MMM yy");
break;
default:
for(int i=0; i<ucd->x.asString().count(); i++) series.labels << ucd->x.asString()[i];
break;
}
break;
}
}
series.colors.clear();
QColor min=QColor(series.color);
QColor max=GCColor::invertColor(GColor(CPLOTBACKGROUND));
@@ -211,13 +228,26 @@ UserChart::setRide(RideItem *item)
// find the first series for this axis and set the categories
// to the x series values.
if (chartinfo.type == GC_CHART_BAR && axis.orientation == Qt::Horizontal) {
// DATERANGE values are days from 01-01-1900
QDateTime earliest(QDate(1900,01,01), QTime(0,0,0), Qt::LocalTime);
// find the first series for axis.name
foreach(GenericSeriesInfo s, seriesinfo) {
if (s.xname == axis.name && s.user1) {
axis.type = GenericAxisInfo::CATEGORY;
axis.categories.clear();
UserChartData *ucd = static_cast<UserChartData*>(s.user1);
for(int i=0; i<ucd->x.asString().count(); i++) axis.categories << ucd->x.asString()[i];
switch (axis.type) {
case GenericAxisInfo::TIME:
for(int i=0; i<ucd->x.asNumeric().count(); i++) axis.categories << time_to_string(ucd->x.asNumeric()[i], true);
break;
case GenericAxisInfo::DATERANGE:
for(int i=0; i<ucd->x.asNumeric().count(); i++) axis.categories << earliest.addDays(ucd->x.asNumeric()[i]).toString("dd MMM yy");
break;
default:
for(int i=0; i<ucd->x.asString().count(); i++) axis.categories << ucd->x.asString()[i];
break;
}
axis.type = GenericAxisInfo::CATEGORY;
break;
}
}