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

Add WPK estimates to PDEStimates

Browse Source 
.. but not plotted in LTM or shown o the
   summary chart yet
This commit is contained in:
Mark Liversedge
2014-06-09 12:40:48 +01:00
parent 8fd4c6834c
commit a1ad374c6c
6 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/RideFileCache.cpp
View File

@@ -233,7 +233,7 @@ static long countForMeanMax(RideFileCacheHeader head, RideFile::SeriesType serie
return 0;
}
QVector<float> RideFileCache::meanMaxPowerFor(Context *context, QDate from, QDate to)
QVector<float> RideFileCache::meanMaxPowerFor(Context *context, QVector<float> &wpk, QDate from, QDate to)
{
QVector<float> returning;
bool first = true;
@@ -248,13 +248,13 @@ QVector<float> RideFileCache::meanMaxPowerFor(Context *context, QDate from, QDat
if (first == true) {
// first time through the whole thing is going to be best
returning = meanMaxPowerFor(context, context->athlete->home.absolutePath() + "/" + rideFileName);
returning = meanMaxPowerFor(context, wpk, context->athlete->home.absolutePath() + "/" + rideFileName);
first = false;
} else {
// next time through we should only pick out better times
QVector<float> ridebest = meanMaxPowerFor(context, context->athlete->home.absolutePath() + "/" + rideFileName);
QVector<float> ridebest = meanMaxPowerFor(context, wpk, context->athlete->home.absolutePath() + "/" + rideFileName);
// do we need to increase the returning array?
if (returning.size() < ridebest.size()) returning.resize(ridebest.size());
@@ -268,7 +268,7 @@ QVector<float> RideFileCache::meanMaxPowerFor(Context *context, QDate from, QDat
return returning;
}
QVector<float> RideFileCache::meanMaxPowerFor(Context *, QString fileName)
QVector<float> RideFileCache::meanMaxPowerFor(Context *, QVector<float>&wpk, QString fileName)
{
QTime start;
start.start();
@@ -305,6 +305,10 @@ QVector<float> RideFileCache::meanMaxPowerFor(Context *, QString fileName)
returning.resize(head.wattsMeanMaxCount);
inFile.readRawData((char*)returning.constData(), head.wattsMeanMaxCount * sizeof(float));
wpk.resize(head.wattsMeanMaxCount);
inFile.readRawData((char*)wpk.constData(), head.wattsKgMeanMaxCount * sizeof(float));
//qDebug()<<"retrieved:"<<head.wattsMeanMaxCount<<"in:"<<start.elapsed()<<"ms";
}