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

Bar Chart and Group By Category Labels

Browse Source 
.. slightly improved category labels on a bar chart when groupby
   and date range is used. Labels for week, month and year are now
   specific e.g. 23/5, May and 2021 labels are applied respectively.
This commit is contained in:
Mark Liversedge
2021-08-10 21:02:59 +01:00
parent cc0bb2e6d6
commit 8375f539db
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Charts/UserChart.cpp
View File

@@ -292,20 +292,53 @@ UserChart::setRide(const RideItem *item)
// find the first series for axis.name
foreach(GenericSeriesInfo s, seriesinfo) {
if (s.xname == axis.name && s.user1) {
axis.categories.clear();
UserChartData *ucd = static_cast<UserChartData*>(s.user1);
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");
case GenericAxisInfo::DATERANGE: {
// date labels, date, week #, month name, year
QString dateformat= "dd MMM yy";
int ax=GenericAxisInfo::findAxis(axisinfo, s.xname); // lookup axisinfo
if (ax != -1 && axisinfo[ax].groupby != 0 && axisinfo[ax].type == GenericAxisInfo::DATERANGE) {
// date format depends on how data was grouped
switch(axisinfo[ax].groupby) {
default:
case GenericAxisInfo::NONE:
case GenericAxisInfo::DAY:
dateformat= "dd MMM yy";
break;
case GenericAxisInfo::WEEK:
dateformat = "d/M"; // week commencing
break;
case GenericAxisInfo::MONTH:
dateformat = "MMM yy";
break;
case GenericAxisInfo::YEAR:
dateformat = "yyyy";
break;
}
}
// create the labels
for(int i=0; i<ucd->x.asNumeric().count(); i++)
axis.categories << earliest.addDays(ucd->x.asNumeric()[i]).toString(dateformat);
}
break;
default:
for(int i=0; i<ucd->x.asString().count(); i++) axis.categories << ucd->x.asString()[i];
break;
}
axis.type = GenericAxisInfo::CATEGORY; // xxx ack ack ack - groupby dates and bar charts....
axis.type = GenericAxisInfo::CATEGORY;
break;
}
}