diff --git a/src/Charts/CPPlot.cpp b/src/Charts/CPPlot.cpp index 529dc145e..b33d6c103 100644 --- a/src/Charts/CPPlot.cpp +++ b/src/Charts/CPPlot.cpp @@ -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; } } diff --git a/src/Charts/LTMWindow.cpp b/src/Charts/LTMWindow.cpp index 90fbb4d60..f7559d9c2 100644 --- a/src/Charts/LTMWindow.cpp +++ b/src/Charts/LTMWindow.cpp @@ -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 = ""; - 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 > hdatas; @@ -1564,9 +1565,9 @@ LTMWindow::dataTable(bool html) } // First column, date / month year etc - if (html) rowSummary += ""; - 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("").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; jdateTime.date().toString("MM/dd/yy"); + out << item->dateTime.date().toString(Qt::ISODate); out << "," << item->dateTime.time().toString("hh:mm:ss"); out << "," << item->fileName;
%2%1%1