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

Merge pull request #1211 from Joern-R/fullplot

Browse Source 
Fullplot - Alt/Slope de-activated
This commit is contained in:
Mark Liversedge
2014-12-29 16:59:33 +00:00
parent 0672ab7e31 5f46aaf134
commit e58a6efc90
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/AllPlotWindow.cpp
View File

@@ -1075,7 +1075,6 @@ AllPlotWindow::compareChanged()
connect(plot->_canvasPicker, SIGNAL(pointHover(QwtPlotCurve*, int)), plot, SLOT(pointHover(QwtPlotCurve*, int)));
// No x axis titles
plot->bydist = fullPlot->bydist;
plot->showAltSlopeState = fullPlot->showAltSlopeState;
if (x.one == RideFile::watts) plot->setShadeZones(showPower->currentIndex() == 0);
else plot->setShadeZones(false);
plot->setAxisVisible(QwtPlot::xBottom, true);
@@ -1092,6 +1091,8 @@ AllPlotWindow::compareChanged()
// y-axis title and colour
if (x.one == RideFile::alt && x.two == RideFile::slope) {
plot->setAxisTitle(QwtPlot::yLeft, tr("Alt/Slope"));
plot->showAltSlopeState = allPlot->showAltSlopeState;
plot->setAltSlopePlotStyle(allPlot->standard->altSlopeCurve);
} else {
plot->setAxisTitle(QwtPlot::yLeft, RideFile::seriesName(x.one));
}
@@ -2415,18 +2416,11 @@ AllPlotWindow::setShowAltSlope(int value)
// compare mode selfcontained update
if (isCompare()) {
// transfer changes of setting here (which is more than on/off) also to other plot settings
fullPlot->showAltSlopeState = value;
fullPlot->setAltSlopePlotStyle(fullPlot->standard->altSlopeCurve);
allPlot->showAltSlopeState = value;
allPlot->setAltSlopePlotStyle(allPlot->standard->altSlopeCurve);
compareChanged();
active = false;
return;
}
fullPlot->setShowAltSlope(value);
allPlot->setShowAltSlope(value);
foreach (AllPlot *plot, allPlots)