nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Axis group by fill zero for bar charts

Browse Source 
.. when aggregating on a date axis we do not fill gaps
   e.g. when no rides for a period. This causes the bar
   chart to be somewhat misleading.
This commit is contained in:
Mark Liversedge
2021-08-18 08:40:10 +01:00
parent 29485aa327
commit 7cc2219293
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Charts/UserChart.cpp
View File

@@ -216,8 +216,8 @@ UserChart::setRide(const RideItem *item)
// groupBy uses pass by reference and will update what is passed
// we update the ucd result as its used elsewhere
if (xgroupby > 0) groupBy(xgroupby, series.aggregateby, series.xseries, series.yseries);
if (ygroupby > 0) groupBy(ygroupby, series.aggregateby, series.yseries, series.xseries);
if (xgroupby > 0) groupBy(xgroupby, series.aggregateby, series.xseries, series.yseries, chartinfo.type == GC_CHART_BAR);
if (ygroupby > 0) groupBy(ygroupby, series.aggregateby, series.yseries, series.xseries, chartinfo.type == GC_CHART_BAR);
// this is a bit of a hack, but later processing references ucd->x and y, so we
// update them since they have been smoothed/aggregated.
@@ -381,7 +381,7 @@ UserChart::setRide(const RideItem *item)
// genericchart has intervened) they are converted to MSsincetheEpoch
// but at this point, we have days since Jan 1 1900
void
UserChart::groupBy(int groupby, int aggregateby, QVector<double> &xseries, QVector<double> &yseries)
UserChart::groupBy(int groupby, int aggregateby, QVector<double> &xseries, QVector<double> &yseries, bool fillzero)
{
// used to aggregate
double aggregate=0;
@@ -410,6 +410,17 @@ UserChart::groupBy(int groupby, int aggregateby, QVector<double> &xseries, QVect
newx << epoch.daysTo(dateForGroup(groupby, lastgroup));
newy << aggregate;
if (fillzero) {
// we fill gaps with zero for some chart types
// notably category based charts e.g. bar chart
for(int j=lastgroup+1; j<group;j++) {
newx << epoch.daysTo(dateForGroup(groupby, j));
newy << 0;
}
}
aggregate = 0;
lastgroup = group;
groupcount = 0;

2
src/Charts/UserChart.h
View File

@@ -59,7 +59,7 @@ class UserChart : public QWidget {
void setGraphicsItem(QGraphicsItem *);
// groupBy day, week, month etc where x is dates and y is values
void groupBy(int groupby, int aggregateby, QVector<double> &xseries, QVector<double> &yseries);
void groupBy(int groupby, int aggregateby, QVector<double> &xseries, QVector<double> &yseries, bool fillzero);
long groupForDate(int groupby, QDate date);
QDate dateForGroup(int groupby, long);