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

Model Estimate Fixups

Browse Source 
.. don't rely upon ZDATA metadata, instead we add
   a new 'present' field that contains the Data meta value

.. navigator defaults columns when they're all messed up

.. summary isn't so noisy when providing progress updates
This commit is contained in:
Mark Liversedge
2014-06-14 20:24:06 +01:00
parent 8038799b65
commit ee6251beff
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/DBAccess.cpp
View File

@@ -94,8 +94,9 @@
// 73 11 May 2014 Mark Liversedge Default color of 1,1,1 now uses CPLOTMARKER for ride color, change version to force rebuild
// 74 20 May 2014 Mark Liversedge Added Athlete Weight
// 75 25 May 2014 Mark Liversedge W' work calculation changed to only include energy above CP
// 76 14 May 2014 Mark Liversedge Add new 'present' field that uses Data tag data
int DBSchemaVersion = 75;
int DBSchemaVersion = 76;
DBAccess::DBAccess(Context* context) : context(context), db(NULL)
{
@@ -188,6 +189,7 @@ bool DBAccess::createMetricsTable()
"timestamp integer,"
"crc integer,"
"ride_date date,"
"present varchar,"
"color varchar,"
"fingerprint integer";
@@ -428,7 +430,7 @@ bool DBAccess::importRide(SummaryMetrics *summaryMetrics, RideFile *ride, QColor
}
// construct an insert statement
QString insertStatement = "insert into metrics ( filename, identifier, crc, timestamp, ride_date, color, fingerprint ";
QString insertStatement = "insert into metrics ( filename, identifier, crc, timestamp, ride_date, present, color, fingerprint ";
const RideMetricFactory &factory = RideMetricFactory::instance();
for (int i=0; i<factory.metricCount(); i++)
insertStatement += QString(", X%1 ").arg(factory.metricName(i));
@@ -446,7 +448,7 @@ bool DBAccess::importRide(SummaryMetrics *summaryMetrics, RideFile *ride, QColor
}
}
insertStatement += " ) values (?,?,?,?,?,?,?"; // filename, identifier, crc, timestamp, ride_date, color, fingerprint
insertStatement += " ) values (?,?,?,?,?,?,?,?"; // filename, identifier, crc, timestamp, ride_date, present, color, fingerprint
for (int i=0; i<factory.metricCount(); i++)
insertStatement += ",?";
foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) {
@@ -465,6 +467,7 @@ bool DBAccess::importRide(SummaryMetrics *summaryMetrics, RideFile *ride, QColor
query.addBindValue((int)computeFileCRC(fullPath));
query.addBindValue(timestamp.toTime_t());
query.addBindValue(summaryMetrics->getRideDate());
query.addBindValue(ride->getTag("Data", ""));
query.addBindValue(color.name());
query.addBindValue((int)fingerprint);