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

Add Labels on Matches in Ride Plot

Browse Source 
.. makes it easier to scan and see where it got to without
   having to mouse over the points one by one
This commit is contained in:
Mark Liversedge
2014-10-11 11:26:47 +01:00
parent 7a9d068949
commit 1f00790069
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/AllPlot.cpp
View File

@@ -721,6 +721,8 @@ void
AllPlot::configChanged()
{
double width = appsettings->value(this, GC_LINEWIDTH, 0.5).toDouble();
labelFont.fromString(appsettings->value(this, GC_FONT_CHARTLABELS, QFont().toString()).toString());
labelFont.setPointSize(appsettings->value(NULL, GC_FONT_CHARTLABELS_SIZE, 8).toInt());
if (appsettings->value(this, GC_ANTIALIAS, true).toBool() == true) {
standard->wattsCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
@@ -1124,6 +1126,47 @@ void AllPlot::refreshZoneLabels()
}
}
void
AllPlot::setMatchLabels(AllPlotObject *objects)
{
// clear anyway
foreach(QwtPlotMarker *p, objects->matchLabels) {
p->detach();
delete p;
}
objects->matchLabels.clear();
// add new ones, but only if showW
if (showW && objects->mCurve) {
bool below = false;
// zip through the matches and add a label
for (size_t i=0; i<objects->mCurve->data()->size(); i++) {
// mCurve->data()->sample(i);
// Qwt uses its own text objects
QwtText text(QString("%1").arg(objects->mCurve->data()->sample(i).y()/1000.00f, 4, 'f', 1));
text.setFont(labelFont);
text.setColor(QColor(255,127,0)); // supposed to be configurable !
// make that mark -- always above with topN
QwtPlotMarker *label = new QwtPlotMarker();
label->setLabel(text);
label->setValue(objects->mCurve->data()->sample(i).x(), objects->mCurve->data()->sample(i).y());
label->setYAxis(objects->mCurve->yAxis());
label->setSpacing(6); // not px but by yaxis value !? mad.
label->setLabelAlignment(below ? (Qt::AlignBottom | Qt::AlignCenter) :
(Qt::AlignTop | Qt::AlignCenter));
// and attach
label->attach(this);
objects->matchLabels << label;
// toggle top / bottom
below = !below;
}
}
}
void
AllPlot::recalc(AllPlotObject *objects)
@@ -1148,6 +1191,7 @@ AllPlot::recalc(AllPlotObject *objects)
objects->wCurve->setSamples(data,data);
objects->mCurve->setSamples(data,data);
setMatchLabels(objects);
if (!objects->atissArray.empty()) objects->atissCurve->setSamples(data, data);
if (!objects->antissArray.empty()) objects->antissCurve->setSamples(data, data);
@@ -1552,6 +1596,7 @@ AllPlot::recalc(AllPlotObject *objects)
objects->wprime.data(), objects->wprime.count());
objects->mCurve->setSamples(bydist ? objects->matchDist.data() : objects->matchTime.data(),
objects->match.data(), objects->match.count());
setMatchLabels(objects);
}
if (!objects->wattsArray.empty()) {
@@ -2243,6 +2288,7 @@ AllPlot::setDataFromPlot(AllPlot *plot, int startidx, int stopidx)
plot->standard->wprime.data(), plot->standard->wprime.count());
standard->mCurve->setSamples(bydist ? plot->standard->matchDist.data() : plot->standard->matchTime.data(),
plot->standard->match.data(), plot->standard->match.count());
setMatchLabels(standard);
}
int points = stopidx - startidx + 1; // e.g. 10 to 12 is 3 points 10,11,12, so not 12-10 !
standard->wattsCurve->setSamples(xaxis,smoothW,points);
@@ -3404,6 +3450,7 @@ AllPlot::setDataFromObject(AllPlotObject *object, AllPlot *reference)
object->wprime.data(), object->wprime.count());
standard->mCurve->setSamples(bydist ? object->matchDist.data() : object->matchTime.data(),
object->match.data(), object->match.count());
setMatchLabels(standard);
}
if (!object->wattsArray.empty()) {

4
src/AllPlot.h
View File

@@ -32,6 +32,7 @@
#include <qwt_scale_widget.h>
#include <qwt_compat.h>
#include <QtGui>
#include <QFont>
#include <QTableWidget>
#include <QStackedWidget>
@@ -362,6 +363,7 @@ class AllPlotObject : public QObject
QVector<double> match;
QVector<double> matchTime;
QVector<double> matchDist;
QVector<QwtPlotMarker*> matchLabels;
QVector<double> wprime;
QVector<double> wprimeTime;
QVector<double> wprimeDist;
@@ -456,6 +458,7 @@ class AllPlot : public QwtPlot
void setDataFromPlots(QList<AllPlot*>); // user for single series comparing
void setDataFromObject(AllPlotObject *object, AllPlot *reference); // for allplot when one per ride in a stack
// reference is for settings et al
void setMatchLabels(AllPlotObject *object); // set labels from object
// convert from time/distance to index in *smoothed* datapoints
int timeIndex(double) const;
@@ -583,6 +586,7 @@ class AllPlot : public QwtPlot
bool isolation;
LTMToolTip *tooltip;
LTMCanvasPicker *_canvasPicker; // allow point selection/hover
QFont labelFont;
static void nextStep( int& step );
};