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

change smoothXYZ arrays into QVectors

Browse Source 
To match coding conventions and simplify memory management.
This commit is contained in:
Sean Rhea
2009-09-14 11:43:39 -04:00
parent 494e4d949e
commit 54044697b9
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/AllPlot.cpp
View File

@@ -299,13 +299,13 @@ AllPlot::recalc()
QList<DataPoint*> list;
double *smoothWatts = new double[rideTimeSecs + 1];
double *smoothHr = new double[rideTimeSecs + 1];
double *smoothSpeed = new double[rideTimeSecs + 1];
double *smoothCad = new double[rideTimeSecs + 1];
double *smoothTime = new double[rideTimeSecs + 1];
double *smoothDistance = new double[rideTimeSecs + 1];
double *smoothAltitude = new double[rideTimeSecs + 1];
QVector<double> smoothWatts(rideTimeSecs + 1);
QVector<double> smoothHr(rideTimeSecs + 1);
QVector<double> smoothSpeed(rideTimeSecs + 1);
QVector<double> smoothCad(rideTimeSecs + 1);
QVector<double> smoothTime(rideTimeSecs + 1);
QVector<double> smoothDistance(rideTimeSecs + 1);
QVector<double> smoothAltitude(rideTimeSecs + 1);
QMap<double, int> interList; //Store the times and intervals
// Times are unique, intervals are not always
@@ -386,19 +386,19 @@ AllPlot::recalc()
smoothTime[secs] = secs / 60.0;
}
double *xaxis = bydist ? smoothDistance : smoothTime;
QVector<double> &xaxis = bydist ? smoothDistance : smoothTime;
// set curves
if (wattsArray)
wattsCurve->setData(xaxis, smoothWatts, rideTimeSecs + 1);
wattsCurve->setData(xaxis.data(), smoothWatts.data(), rideTimeSecs + 1);
if (hrArray)
hrCurve->setData(xaxis, smoothHr, rideTimeSecs + 1);
hrCurve->setData(xaxis.data(), smoothHr.data(), rideTimeSecs + 1);
if (speedArray)
speedCurve->setData(xaxis, smoothSpeed, rideTimeSecs + 1);
speedCurve->setData(xaxis.data(), smoothSpeed.data(), rideTimeSecs + 1);
if (cadArray)
cadCurve->setData(xaxis, smoothCad, rideTimeSecs + 1);
cadCurve->setData(xaxis.data(), smoothCad.data(), rideTimeSecs + 1);
if (altArray)
altCurve->setData(xaxis, smoothAltitude, rideTimeSecs + 1);
altCurve->setData(xaxis.data(), smoothAltitude.data(), rideTimeSecs + 1);
setAxisScale(xBottom, 0.0, bydist ? totalDist : smoothTime[rideTimeSecs]);
setYMax();
@@ -429,21 +429,6 @@ AllPlot::recalc()
}
replot();
if(smoothWatts != NULL)
delete [] smoothWatts;
if(smoothHr != NULL)
delete [] smoothHr;
if(smoothSpeed != NULL)
delete [] smoothSpeed;
if(smoothCad != NULL)
delete [] smoothCad;
if(smoothTime != NULL)
delete [] smoothTime;
if(smoothDistance != NULL)
delete [] smoothDistance;
if(smoothAltitude != NULL)
delete [] smoothAltitude;
}
void