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

Fix select linear regress paint for time x-axis

Browse Source 
.. scaling and transformation of x-value was needed before painting the
   linear regression line when using a time axis.
This commit is contained in:
Mark Liversedge
2020-03-20 18:39:17 +00:00
parent 63ebd5fc7c
commit 987e79024f
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Charts/GenericSelectTool.cpp
View File

@@ -234,11 +234,31 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
painter->drawText(QPointF(0,0), lr);
}
double startx = static_cast<QValueAxis*>(calc.xaxis)->min();
double stopx = static_cast<QValueAxis*>(calc.xaxis)->max();
// get start and stop points for slope line
QPointF startp, stopp;
if (calc.xaxis->type() == QAbstractAxis::AxisTypeValue ||
(calc.xaxis->type() == QAbstractAxis::AxisTypeDateTime &&
static_cast<QDateTimeAxis*>(calc.xaxis)->format() == GenericPlot::gl_dateformat)) {
QPointF startp = mapFromScene(host->qchart->mapToPosition(QPointF(startx,calc.b+(startx*calc.m)),calc.series));
QPointF stopp = mapFromScene(host->qchart->mapToPosition(QPointF(stopx,calc.b+(stopx*calc.m)),calc.series));
// continuous or date don't need transforming
double startx = static_cast<QValueAxis*>(calc.xaxis)->min();
double stopx = static_cast<QValueAxis*>(calc.xaxis)->max();
startp = mapFromScene(host->qchart->mapToPosition(QPointF(startx,calc.b+(startx*calc.m)),calc.series));
stopp = mapFromScene(host->qchart->mapToPosition(QPointF(stopx,calc.b+(stopx*calc.m)),calc.series));
} else {
// time formats need transforming
double startx = static_cast<QDateTimeAxis*>(calc.xaxis)->min().toMSecsSinceEpoch();
double stopx = static_cast<QDateTimeAxis*>(calc.xaxis)->max().toMSecsSinceEpoch();
double startsecs = calc.midnight.secsTo(static_cast<QDateTimeAxis*>(calc.xaxis)->min());
double stopsecs= calc.midnight.secsTo(static_cast<QDateTimeAxis*>(calc.xaxis)->max());
startp = mapFromScene(host->qchart->mapToPosition(QPointF(startx,calc.b+(startsecs*calc.m)),calc.series));
stopp = mapFromScene(host->qchart->mapToPosition(QPointF(stopx,calc.b+(stopsecs*calc.m)),calc.series));
}
// draw slope line
QColor col=GColor(CPLOTMARKER);
col.setAlphaF(1);
QPen line(col);