nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 00:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix axis paint of cursor values in GenericPlot

Browse Source 
.. now we have the axis rectangle (previous commit) we can paint
   the cursor values in the axis rather than on the canvas. Lots
   of work to fix a cosmetic issue, but damn, it was worth it.
This commit is contained in:
Mark Liversedge
2020-02-29 14:01:23 +00:00
parent 73be187b15
commit c81576e311
2 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Charts/GenericPlot.cpp
View File

@@ -748,6 +748,8 @@ GenericPlot::finaliseChart()
item->installSceneEventFilter(selector); // XXX create sceneitem to help us here!
}
plotAreaChanged(); // make sure get updated before paint
}
bool

69
src/Charts/GenericSelectTool.cpp
View File

@@ -44,7 +44,6 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
{
// don't paint outside the canvas
painter->save();
painter->setClipRect(mapRectFromScene(host->qchart->plotArea()));
// min max texts
QFont stGiles; // hoho - Chart Font St. Giles ... ok you have to be British to get this joke
@@ -60,38 +59,6 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
case XRANGE:
{
// current position for each series - we only do first, coz only interested in x axis anyway
foreach(QAbstractSeries *series, host->qchart->series()) {
if (series->isVisible() == false) continue; // ignore invisble curves
// convert screen position to value for series
QPointF v = host->qchart->mapToValue(spos,series);
double miny=0;
foreach (QAbstractAxis *axis, series->attachedAxes()) {
if (axis->orientation() == Qt::Vertical && axis->type()==QAbstractAxis::AxisTypeValue) {
miny=static_cast<QValueAxis*>(axis)->min();
break;
}
}
QPointF posxp = mapFromScene(host->qchart->mapToPosition(QPointF(v.x(),miny),series));
QPen markerpen(GColor(CPLOTMARKER));
painter->setPen(markerpen);
painter->setBrush(QBrush(GColor(CPLOTBACKGROUND)));
QFontMetrics fm(stGiles); // adjust position to align centre
painter->setFont(stGiles);
// x value
QString label=QString("%1").arg(v.x(),0,'f',0); // no decimal places XXX fixup on series info
label = Utils::removeDP(label); // remove unneccessary decimal places
painter->drawText(posxp-(QPointF(fm.tightBoundingRect(label).width()/2.0,4)), label);
break;
}
// draw the points we are hovering over
foreach(SeriesPoint p, hoverpoints) {
QPointF pos = mapFromScene(host->qchart->mapToPosition(p.xy,p.series));
@@ -106,11 +73,12 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
}
//
// DROPS THROUGH INTO RECTANGLE FOR SELECTION RECTANGLE
// AND SERIES VALUES IN AXIS FOR CURRENT CURSOR POSITION
//
// fall through
case RECTANGLE:
{
if (mode == RECTANGLE && (state == ACTIVE || state == INACTIVE)) {
if (state == ACTIVE || state == INACTIVE) {
if (host->charttype == GC_CHART_LINE || host->charttype == GC_CHART_SCATTER) {
@@ -137,9 +105,28 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
// convert screen position to value for series
QPointF v = host->qchart->mapToValue(spos,series);
QPointF posxp = mapFromScene(host->qchart->mapToPosition(QPointF(v.x(),0),series));
QPointF posyp = mapFromScene(host->qchart->mapToPosition(QPointF(0, v.y()),series));
QPointF posxp = mapFromScene(host->qchart->mapToPosition(QPointF(v.x(),0),series));
// get the scene rect for the y axis
QAbstractAxis *yaxis = NULL;
foreach (QAbstractAxis *axis, series->attachedAxes()) {
if (axis->orientation() == Qt::Vertical) {
yaxis=axis;
break;
}
}
if (yaxis) {
QRectF ar = host->axisRect.value(yaxis, QRectF());
// we have the scene rect for the y axis, so lets use the x value
if (ar != QRectF()) {
posyp.setX(mapFromScene(ar.topLeft()).x()); // move onto axis
}
}
// of course posxp should be at the bottom of the plot area
posxp.setY(mapFromScene(host->qchart->plotArea().bottomLeft()).y());
QPen markerpen(GColor(CPLOTMARKER));
painter->setPen(markerpen);
@@ -155,6 +142,9 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
if (series->type() == QAbstractSeries::SeriesTypeScatter) {
QPen markerpen(static_cast<QScatterSeries*>(series)->color());
painter->setPen(markerpen);
} else if (series->type() == QAbstractSeries::SeriesTypeLine) {
QPen markerpen(static_cast<QLineSeries*>(series)->color());
painter->setPen(markerpen);
} else {
QPen markerpen(Qt::gray); // dunno?
painter->setPen(markerpen);
@@ -171,6 +161,8 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
}
}
painter->setClipRect(mapRectFromScene(host->qchart->plotArea()));
if (state != INACTIVE) {
// there is a rectangle to draw on the screen
@@ -221,6 +213,11 @@ void GenericSelectTool::paint(QPainter*painter, const QStyleOptionGraphicsItem *
QPointF avgyp = mapFromScene(host->qchart->mapToPosition(QPointF(0, calc.y.mean),calc.series));
QPointF avgxp = mapFromScene(host->qchart->mapToPosition(QPointF(calc.x.mean, 0),calc.series));
// bottom of plotarea, remember Y-axis range doesn't always start from 0
minxp.setY(mapFromScene(host->qchart->plotArea().bottomLeft()).y());
maxxp.setY(mapFromScene(host->qchart->plotArea().bottomLeft()).y());
avgxp.setY(mapFromScene(host->qchart->plotArea().bottomLeft()).y());
QColor linecol=GColor(CPLOTMARKER);
linecol.setAlphaF(0.25);
QPen gridpen(linecol);