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

Histogram Compare Fixup

Browse Source 
.. remember we can plot for a season and recognise that
   when checking for isCompareIntervals in PowerHist.

.. fixes a SEGV when looking at a histogram in the trends
   view whilst compare intervals is active in ride view.
This commit is contained in:
Mark Liversedge
2014-01-16 22:55:04 +00:00
parent acb8156dce
commit 36cb0e0eff
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/PowerHist.cpp
View File

@@ -45,9 +45,10 @@
#include "LTMCanvasPicker.h" // for tooltip
PowerHist::PowerHist(Context *context):
PowerHist::PowerHist(Context *context, bool rangemode) :
minX(0),
maxX(0),
rangemode(rangemode),
rideItem(NULL),
context(context),
series(RideFile::watts),
@@ -303,7 +304,7 @@ PowerHist::recalcCompareIntervals()
// Set curves .. they will always have been created
// in setDataFromCompareIntervals, but no samples set
if (!isVisible() && !context->isCompareIntervals) return;
if (!isVisible() && (rangemode || !context->isCompareIntervals)) return;
double ncols = 0;
foreach(CompareInterval x, context->compareIntervals) {
@@ -540,7 +541,7 @@ PowerHist::recalcCompareIntervals()
void
PowerHist::recalc(bool force)
{
if (context->isCompareIntervals) { //XXX bodge for now
if (!rangemode && context->isCompareIntervals) {
recalcCompareIntervals();
return;
}
@@ -831,7 +832,7 @@ PowerHist::setYMax()
{
double MaxY=0;
if (context->isCompareIntervals) {
if (!rangemode && context->isCompareIntervals) {
int i=0;
foreach (QwtPlotCurve *p, compareCurves) {
@@ -1034,7 +1035,7 @@ void
PowerHist::setComparePens()
{
// no compare? don't bother
if (!context->isCompareIntervals) return;
if (rangemode || !context->isCompareIntervals) return;
double width = appsettings->value(this, GC_LINEWIDTH, 2.0).toDouble();
for (int i=0; i<context->compareIntervals.count(); i++) {