From 77ce41fd6fc3ce8e638674a768faed89e2b1cb86 Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Sun, 11 Jun 2023 08:17:38 -0400 Subject: [PATCH 1/2] Changed Rx Setting to Device setting --- oscar/statistics.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index b49af188..4c3d4654 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -1771,7 +1771,7 @@ QString Statistics::UpdateRecordsBox() if (list.size() >= 2) { - html += ""+tr("Best RX Setting")+"
"; + html += ""+tr("Best Device Setting")+"
"; const RXItem & rxbest = *list.at(0); html += QString("").arg(rxbest.start.toString(Qt::ISODate)).arg(rxbest.end.toString(Qt::ISODate)) + tr("Date: %1 - %2").arg(rxbest.start.toString(Qt::SystemLocaleShortDate)).arg(rxbest.end.toString(Qt::SystemLocaleShortDate)) + "
"; @@ -1783,7 +1783,7 @@ QString Statistics::UpdateRecordsBox() html += QString("%1").arg(formatRelief(rxbest.relief)) + "
"; html += "
"; - html += ""+tr("Worst RX Setting")+"
"; + html += ""+tr("Worst Device Setting")+"
"; const RXItem & rxworst = *list.at(list.size() -1); html += QString("").arg(rxworst.start.toString(Qt::ISODate)).arg(rxworst.end.toString(Qt::ISODate)) + tr("Date: %1 - %2").arg(rxworst.start.toString(Qt::SystemLocaleShortDate)).arg(rxworst.end.toString(Qt::SystemLocaleShortDate)) + "
"; From c3a9cb377d1b4eca84b432828db1416da374d4cd Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Sun, 11 Jun 2023 08:48:49 -0400 Subject: [PATCH 2/2] statistics - change date format to system local. --- oscar/statistics.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 4c3d4654..463d7456 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -998,9 +998,11 @@ struct Period { } else { start = qMax(last.addDays(advance),first); } - name = name + "
" + start.toString("ddMMMyy") ; + name = name + "
" + start.toString(Qt::SystemLocaleShortDate) ; + //name = name + "
" + start.toString(Qt::RFC2822Date) ; if (advance!=0) { - name = name + " - " + last.toString("ddMMMyy"); + //name = name + " - " + last.toString(Qt::RFC2822Date); + name = name + " - " + last.toString(Qt::SystemLocaleShortDate); } this->header = name; this->start = start ;