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

Move wpk array next to watts array in cache

Browse Source 
.. so we can read them both in with a single
   read -- this is to support an update where
   pd estimates support wpk and absolute watts.
This commit is contained in:
Mark Liversedge
2014-06-09 09:10:40 +01:00
parent 7480a2ea00
commit 90ded04a53
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/RideFileCache.cpp
View File

@@ -145,8 +145,7 @@ static long offsetForMeanMax(RideFileCacheHeader head, RideFile::SeriesType seri
long offset = 0;
switch (series) {
case RideFile::aPower : offset += head.wattsKgMeanMaxCount * sizeof(float);
case RideFile::wattsKg : offset += head.vamMeanMaxCount * sizeof(float);
case RideFile::aPower : offset += head.vamMeanMaxCount * sizeof(float);
case RideFile::vam : offset += head.npMeanMaxCount * sizeof(float);
case RideFile::NP : offset += head.xPowerMeanMaxCount * sizeof(float);
case RideFile::xPower : offset += head.kphMeanMaxCount * sizeof(float);
@@ -158,7 +157,8 @@ static long offsetForMeanMax(RideFileCacheHeader head, RideFile::SeriesType seri
case RideFile::kph : offset += head.nmMeanMaxCount * sizeof(float);
case RideFile::nm : offset += head.cadMeanMaxCount * sizeof(float);
case RideFile::cad : offset += head.hrMeanMaxCount * sizeof(float);
case RideFile::hr : offset += head.wattsMeanMaxCount * sizeof(float);
case RideFile::hr : offset += head.wattsKgMeanMaxCount * sizeof(float);
case RideFile::wattsKg : offset += head.wattsMeanMaxCount * sizeof(float);
case RideFile::watts : offset += 0;
default:
break;
@@ -174,7 +174,6 @@ static long offsetForTiz(RideFileCacheHeader head, RideFile::SeriesType series)
// skip past the mean max arrays
offset += head.aPowerMeanMaxCount * sizeof(float);
offset += head.wattsKgMeanMaxCount * sizeof(float);
offset += head.vamMeanMaxCount * sizeof(float);
offset += head.npMeanMaxCount * sizeof(float);
offset += head.xPowerMeanMaxCount * sizeof(float);
@@ -187,6 +186,7 @@ static long offsetForTiz(RideFileCacheHeader head, RideFile::SeriesType series)
offset += head.nmMeanMaxCount * sizeof(float);
offset += head.cadMeanMaxCount * sizeof(float);
offset += head.hrMeanMaxCount * sizeof(float);
offset += head.wattsKgMeanMaxCount * sizeof(float);
offset += head.wattsMeanMaxCount * sizeof(float);
// skip past the distribution arrays
@@ -1484,6 +1484,7 @@ RideFileCache::serialize(QDataStream *out)
// write meanmax
out->writeRawData((const char *) wattsMeanMax.data(), sizeof(float) * wattsMeanMax.size());
out->writeRawData((const char *) wattsKgMeanMax.data(), sizeof(float) * wattsKgMeanMax.size());
out->writeRawData((const char *) hrMeanMax.data(), sizeof(float) * hrMeanMax.size());
out->writeRawData((const char *) cadMeanMax.data(), sizeof(float) * cadMeanMax.size());
out->writeRawData((const char *) nmMeanMax.data(), sizeof(float) * nmMeanMax.size());
@@ -1496,7 +1497,6 @@ RideFileCache::serialize(QDataStream *out)
out->writeRawData((const char *) xPowerMeanMax.data(), sizeof(float) * xPowerMeanMax.size());
out->writeRawData((const char *) npMeanMax.data(), sizeof(float) * npMeanMax.size());
out->writeRawData((const char *) vamMeanMax.data(), sizeof(float) * vamMeanMax.size());
out->writeRawData((const char *) wattsKgMeanMax.data(), sizeof(float) * wattsKgMeanMax.size());
out->writeRawData((const char *) aPowerMeanMax.data(), sizeof(float) * aPowerMeanMax.size());
// write dist
@@ -1556,6 +1556,7 @@ RideFileCache::readCache()
// read in the arrays
inFile.readRawData((char *) wattsMeanMax.data(), sizeof(float) * wattsMeanMax.size());
inFile.readRawData((char *) wattsKgMeanMax.data(), sizeof(float) * wattsKgMeanMax.size());
inFile.readRawData((char *) hrMeanMax.data(), sizeof(float) * hrMeanMax.size());
inFile.readRawData((char *) cadMeanMax.data(), sizeof(float) * cadMeanMax.size());
inFile.readRawData((char *) nmMeanMax.data(), sizeof(float) * nmMeanMax.size());
@@ -1568,7 +1569,6 @@ RideFileCache::readCache()
inFile.readRawData((char *) xPowerMeanMax.data(), sizeof(float) * xPowerMeanMax.size());
inFile.readRawData((char *) npMeanMax.data(), sizeof(float) * npMeanMax.size());
inFile.readRawData((char *) vamMeanMax.data(), sizeof(float) * vamMeanMax.size());
inFile.readRawData((char *) wattsKgMeanMax.data(), sizeof(float) * wattsKgMeanMax.size());
inFile.readRawData((char *) aPowerMeanMax.data(), sizeof(float) * aPowerMeanMax.size());