From 6f966f613d6cb33b0a38184f3a888f8960e332ec Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 19 Nov 2018 21:18:41 -0500 Subject: [PATCH] Display and export contest log times in UTC, not local time --- item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp | 2 +- models/CabrilloLog.cpp | 2 +- widgets/astro.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp b/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp index 66d3b6769..5b7f76eb8 100644 --- a/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp +++ b/item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp @@ -28,7 +28,7 @@ public: static QDateTime to_date_time (QVariant const& value) { - return QDateTime::fromMSecsSinceEpoch (value.toULongLong () * 1000ull); + return QDateTime::fromMSecsSinceEpoch (value.toULongLong () * 1000ull, Qt::UTC); } QString displayText (QVariant const& value, QLocale const& locale) const override diff --git a/models/CabrilloLog.cpp b/models/CabrilloLog.cpp index 3e218d643..055f8ae07 100644 --- a/models/CabrilloLog.cpp +++ b/models/CabrilloLog.cpp @@ -128,7 +128,7 @@ void CabrilloLog::export_qsos (QTextStream& stream) const frequency = frequency > 50000000ull ? frequency / 1000ull : frequency; stream << QString {"QSO: %1 DG %2 %3 %4 %5 %6\n"} .arg (frequency, 5) - .arg (QDateTime::fromMSecsSinceEpoch (m_->export_query_.value (when_index).toULongLong () * 1000ull).toString ("yyyy-MM-dd hhmm")) + .arg (QDateTime::fromMSecsSinceEpoch (m_->export_query_.value (when_index).toULongLong () * 1000ull, Qt::UTC).toString ("yyyy-MM-dd hhmm")) .arg (my_call, -12) .arg (m_->export_query_.value (sent_index).toString (), -13) .arg (m_->export_query_.value (call_index).toString (), -12) diff --git a/widgets/astro.cpp b/widgets/astro.cpp index c0e2b1fe3..4ee55da4a 100644 --- a/widgets/astro.cpp +++ b/widgets/astro.cpp @@ -213,7 +213,7 @@ auto Astro::astroUpdate(QDateTime const& t, QString const& mygrid, QString const // we do the next period if we calculate just before it starts auto sec_since_epoch = t.toMSecsSinceEpoch () / 1000 + 2; auto target_sec = sec_since_epoch - sec_since_epoch % TR_period + TR_period / 2; - auto target_date_time = QDateTime::fromMSecsSinceEpoch (target_sec * 1000, QTimeZone::utc ()); + auto target_date_time = QDateTime::fromMSecsSinceEpoch (target_sec * 1000, Qt::UTC); QString date {target_date_time.date().toString("yyyy MMM dd").trimmed ()}; QString utc {target_date_time.time().toString().trimmed ()}; int nyear {target_date_time.date().year()};