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

Export to CSV with UTF8 and ISO date format

Browse Source 
For broader support of translations and date formats
Fixes #3613
This commit is contained in:
Ale Martinez
2020-11-28 17:56:06 -03:00
parent 1957404d03
commit cb37db2281
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Charts/CPPlot.cpp
View File

@@ -2250,8 +2250,8 @@ CPPlot::exportBests(QString filename)
}
// values
if (expmodel) stream << int(xvalue * 60.00f) << "," << yvalue << "," << modelvalue << "," << date.toString() << endl;
else stream << int(xvalue * 60.00f) << "," << yvalue << "," << date.toString() << endl;
if (expmodel) stream << int(xvalue * 60.00f) << "," << yvalue << "," << modelvalue << "," << date.toString(Qt::ISODate) << endl;
else stream << int(xvalue * 60.00f) << "," << yvalue << "," << date.toString(Qt::ISODate) << endl;
}
}

12
src/Charts/LTMWindow.cpp
View File

@@ -1416,14 +1416,15 @@ LTMWindow::dataTable(bool html)
// formatting ...
LTMScaleDraw lsd(settings.start, groupForDate(settings.start.date()), settings.groupBy);
QString sLabel = (settings.groupBy == LTM_TOD) ? tr("Time of Day") : tr("Date");
if (html) {
// table and headings 50% for 1 metric, 70% for 2 metrics, 90% for 3 metrics or more
QString tableStart = "<table border=0 cellspacing=3 width=\"%1%%\"><tr><td align=\"center\" valigne=\"top\"><b>%2</b></td>";
tableStart = tableStart.arg(settings.metrics.count() >= 3 ? 90 : (30 + (settings.metrics.count() * 20))).arg(tr("Date"));
tableStart = tableStart.arg(settings.metrics.count() >= 3 ? 90 : (30 + (settings.metrics.count() * 20))).arg(sLabel);
summary += tableStart;
} else {
summary += tr("Date");
summary += sLabel;
}
QList<QVector<double> > hdatas;
@@ -1564,9 +1565,9 @@ LTMWindow::dataTable(bool html)
}
// First column, date / month year etc
if (html) rowSummary += "<td align=\"center\" valign=\"top\">%1</td>";
else rowSummary += "%1";
rowSummary = rowSummary.arg(lsd.label(columns[0].x[row]+0.5).text().replace("\n", " "));
QString sDate = lsd.label(columns[0].x[row]+0.5).text().replace("\n", " ");
if (html) rowSummary += QString("<td align=\"center\" valign=\"top\">%1</td>").arg(sDate);
else rowSummary += (settings.groupBy == LTM_ALL || settings.groupBy == LTM_TOD) ? sDate : lsd.toDate(columns[0].x[row]+0.5).toString(Qt::ISODate);
// Remaining columns - each metric value
for(int j=0; j<columns.count(); j++) {
@@ -1662,6 +1663,7 @@ LTMWindow::exportData()
// open stream and write header
QTextStream stream(&f);
stream.setCodec("UTF-8"); // Names and Units can be translated
stream << content;
// and we're done

3
src/Core/RideCache.cpp
View File

@@ -449,6 +449,7 @@ RideCache::writeAsCSV(QString filename)
};
file.resize(0);
QTextStream out(&file);
out.setCodec("UTF-8"); // Metric names can be translated
// write headings
out<<"date, time, filename";
@@ -464,7 +465,7 @@ RideCache::writeAsCSV(QString filename)
foreach(RideItem *item, rides()) {
// date, time, filename
out << item->dateTime.date().toString("MM/dd/yy");
out << item->dateTime.date().toString(Qt::ISODate);
out << "," << item->dateTime.time().toString("hh:mm:ss");
out << "," << item->fileName;