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

drop read_cpi_file, cleanup read_one

Browse Source
This commit is contained in:
Sean Rhea
2009-11-07 14:23:51 -05:00
parent 3d6d9ad86d
commit dfc7e88f26
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/CpintPlot.cpp
View File

@@ -208,10 +208,10 @@ cpi_filename_to_date(const QString filename) {
}
static int
read_one(const char *inname, QVector<double> &bests, QVector<QDate> *bestDates,
read_one(const QString &inname, QVector<double> &bests, QVector<QDate> *bestDates,
QHash<QString,bool> *cpiDataInBests)
{
FILE *in = fopen(inname, "r");
FILE *in = fopen(inname.toAscii().constData(), "r");
if (!in)
return -1;
int lineno = 1;
@@ -238,7 +238,7 @@ read_one(const char *inname, QVector<double> &bests, QVector<QDate> *bestDates,
if (bests[secs] < watts){
bests[secs] = watts;
if (bestDates)
(*bestDates)[secs] = cpi_filename_to_date(QString(inname));
(*bestDates)[secs] = cpi_filename_to_date(inname);
// mark the filename as having contributed to the bests
// Note this contribution may subsequently be over-written, so
@@ -253,14 +253,6 @@ read_one(const char *inname, QVector<double> &bests, QVector<QDate> *bestDates,
return 0;
}
static int
read_cpi_file(const QDir &dir, const QFileInfo &raw, QVector<double> &bests,
QVector<QDate> *bestDates, QHash<QString,bool> *cpiDataInBests)
{
QString inname = dir.absoluteFilePath(raw.completeBaseName() + ".cpi");
return read_one(inname.toAscii().constData(), bests, bestDates, cpiDataInBests);
}
// extract critical power parameters which match the given curve
// model: maximal power = cp (1 + tau / [t + t0]), where t is the
// duration of the effort, and t, cp and tau are model parameters
@@ -591,7 +583,7 @@ CpintPlot::calculate(RideItem *rideItem)
progress.show();
foreach (const QString &filename, list) {
QString path = dir.absoluteFilePath(filename);
read_one(path.toAscii().constData(), bests, &bestDates, &cpiDataInBests);
read_one(path, bests, &bestDates, &cpiDataInBests);
progress.setValue(progress.value() + 1);
QCoreApplication::processEvents();
if (progress.wasCanceled()) {
@@ -645,7 +637,8 @@ CpintPlot::calculate(RideItem *rideItem)
thisCurve = NULL;
}
QVector<double> bests;
if ((read_cpi_file(dir, file, bests, NULL, NULL) == 0) && bests.size()) {
QString inname = dir.absoluteFilePath(file.completeBaseName() + ".cpi");
if ((read_one(inname, bests, NULL, NULL) == 0) && bests.size()) {
QVector<double> timeArray(bests.size());
int maxNonZero = 0;
for (int i = 0; i < bests.size(); ++i) {