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

fix bug in 2f8d101, need to strip path

Browse Source 
The filename argument actually contained the whole path.  This fix passes
the filename and directory separately, so that the anchored regex works.
This commit is contained in:
Sean Rhea
2009-11-09 09:16:09 -05:00
parent 632bb6ddd1
commit 82934425ab
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/CpintPlot.cpp
View File

@@ -205,9 +205,10 @@ cpi_filename_to_date(const QString filename) {
}
static int
read_one(const QString &inname, QVector<double> &bests, QVector<QDate> *bestDates,
QHash<QString,bool> *cpiDataInBests)
read_one(const QDir& dir, const QString &filename, QVector<double> &bests,
QVector<QDate> *bestDates, QHash<QString,bool> *cpiDataInBests)
{
QString inname = dir.absoluteFilePath(filename);
FILE *in = fopen(inname.toAscii().constData(), "r");
if (!in)
return -1;
@@ -235,7 +236,7 @@ read_one(const QString &inname, QVector<double> &bests, QVector<QDate> *bestDate
if (bests[secs] < watts){
bests[secs] = watts;
if (bestDates)
(*bestDates)[secs] = cpi_filename_to_date(inname);
(*bestDates)[secs] = cpi_filename_to_date(filename);
// mark the filename as having contributed to the bests
// Note this contribution may subsequently be over-written, so
@@ -576,7 +577,7 @@ CpintPlot::calculate(RideItem *rideItem)
progress.show();
foreach (const QString &filename, list) {
QString path = dir.absoluteFilePath(filename);
read_one(path, bests, &bestDates, &cpiDataInBests);
read_one(dir, filename, bests, &bestDates, &cpiDataInBests);
progress.setValue(progress.value() + 1);
QCoreApplication::processEvents();
if (progress.wasCanceled()) {
@@ -630,8 +631,8 @@ CpintPlot::calculate(RideItem *rideItem)
thisCurve = NULL;
}
QVector<double> bests;
QString inname = dir.absoluteFilePath(file.completeBaseName() + ".cpi");
if ((read_one(inname, bests, NULL, NULL) == 0) && bests.size()) {
QString filename = file.completeBaseName() + ".cpi";
if ((read_one(dir, filename, bests, NULL, NULL) == 0) && bests.size()) {
QVector<double> timeArray(bests.size());
int maxNonZero = 0;
for (int i = 0; i < bests.size(); ++i) {