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

Merge pull request #1010 from Joern-R/pull3

Browse Source 
Small-Plot - wrong Axis Scaling and Labels
This commit is contained in:
Mark Liversedge
2014-08-10 13:33:13 +01:00
parent 625b6b5c95 f53700ec84
commit 181aad1205
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/SmallPlot.cpp
View File

@@ -41,26 +41,28 @@ SmallPlot::SmallPlot(QWidget *parent) : QwtPlot(parent), d_mrk(NULL), smooth(30)
static_cast<QwtPlotCanvas*>(canvas())->setFrameStyle(QFrame::NoFrame);
setXTitle();
wattsCurve = new QwtPlotCurve("Power");
//timeCurves.resize(36);// wattsCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
wattsCurve->setPen(QPen(GColor(CPOWER)));
wattsCurve->attach(this);
hrCurve = new QwtPlotCurve("Heart Rate");
// hrCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
hrCurve->setPen(QPen(GColor(CHEARTRATE)));
hrCurve->attach(this);
setAxesCount(QwtAxis::yLeft, 2);
altCurve = new QwtPlotCurve(tr("Altitude"));
altCurve->setPen(QPen(GColor(CALTITUDE)));
QColor brush_color = GColor(CALTITUDEBRUSH);
brush_color.setAlpha(180);
altCurve->setBrush(brush_color);
altCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,2).id);
altCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,1));
altCurve->attach(this);
wattsCurve = new QwtPlotCurve("Power");
//timeCurves.resize(36);// wattsCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
wattsCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,0));
wattsCurve->setPen(QPen(GColor(CPOWER)));
wattsCurve->attach(this);
hrCurve = new QwtPlotCurve("Heart Rate");
// hrCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
hrCurve->setYAxis(QwtAxisId(QwtAxis::yLeft,0));
hrCurve->setPen(QPen(GColor(CHEARTRATE)));
hrCurve->attach(this);
// grid lines on such a small plot look AWFUL
//grid = new QwtPlotGrid();
//grid->enableX(false);
@@ -181,36 +183,38 @@ void
SmallPlot::setYMax()
{
double ymax = 0;
double y1max = 0;
double y1max = 500;
QString ylabel = "";
QString y1label = "";
if (wattsCurve->isVisible()) {
ymax = max(ymax, wattsCurve->maxYValue());
ylabel += QString((ylabel == "") ? "" : " / ") + "Watts";
ylabel += QString((ylabel == "") ? "" : " / ") + tr("Watts");
}
if (hrCurve->isVisible()) {
ymax = max(ymax, hrCurve->maxYValue());
ylabel += QString((ylabel == "") ? "" : " / ") + "BPM";
ylabel += QString((ylabel == "") ? "" : " / ") + tr("BPM");
}
if (altCurve->isVisible()) {
y1max = altCurve->maxYValue();
y1max = max(y1max, altCurve->maxYValue());
y1label = "m";
}
setAxisScale(yLeft, 0.0, ymax * 1.1);
setAxisTitle(yLeft, ylabel);
setAxisScale(QwtAxisId(QwtAxis::yLeft,2).id, 0.0, y1max * 1.1);
setAxisTitle(QwtAxisId(QwtAxis::yLeft,2).id, y1label);
enableAxis(yLeft, false); // hide for a small plot
setAxisScale(QwtAxisId(QwtAxis::yLeft,0), 0.0, ymax * 1.1);
setAxisTitle(QwtAxisId(QwtAxis::yLeft,0), ylabel);
setAxisScale(QwtAxisId(QwtAxis::yLeft,1), 0.0, y1max * 1.1);
setAxisTitle(QwtAxisId(QwtAxis::yLeft,1), y1label);
setAxisVisible(QwtAxisId(QwtAxis::yLeft,0), false); // hide for a small plot
setAxisVisible(QwtAxisId(QwtAxis::yLeft,1), false); // hide for a small plot
}
void
SmallPlot::setXTitle()
{
setAxisTitle(xBottom, tr("Time (minutes)"));
enableAxis(xBottom, true);
}
void
SmallPlot::setAxisTitle(int axis, QString label)
SmallPlot::setAxisTitle(QwtAxisId axis, QString label)
{
// setup the default fonts
QFont stGiles; // hoho - Chart Font St. Giles ... ok you have to be British to get this joke

2
src/SmallPlot.h
View File

@@ -40,7 +40,7 @@ class SmallPlot : public QwtPlot
int smoothing() const { return smooth; }
void setData(RideItem *rideItem);
void setData(RideFile *rideFile);
void setAxisTitle(int axis, QString label);
void setAxisTitle(QwtAxisId axis, QString label);
void recalc();
void setYMax();
void setXTitle();