w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-15 08:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.0.0-rc5' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc5

Browse Source
This commit is contained in:
Joe Taylor 2018-11-20 07:57:34 -05:00
commit 636bc59c7c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
item_delegates/DateTimeAsSecsSinceEpochDelegate.hpp
View File

@ -28,7 +28,7 @@ public:
static QDateTime to_date_time (QVariant const& value) 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 QString displayText (QVariant const& value, QLocale const& locale) const override

2
models/CabrilloLog.cpp
View File

@ -128,7 +128,7 @@ void CabrilloLog::export_qsos (QTextStream& stream) const
frequency = frequency > 50000000ull ? frequency / 1000ull : frequency; frequency = frequency > 50000000ull ? frequency / 1000ull : frequency;
stream << QString {"QSO: %1 DG %2 %3 %4 %5 %6\n"} stream << QString {"QSO: %1 DG %2 %3 %4 %5 %6\n"}
.arg (frequency, 5) .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 (my_call, -12)
.arg (m_->export_query_.value (sent_index).toString (), -13) .arg (m_->export_query_.value (sent_index).toString (), -13)
.arg (m_->export_query_.value (call_index).toString (), -12) .arg (m_->export_query_.value (call_index).toString (), -12)

2
widgets/astro.cpp
View File

@ -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 // we do the next period if we calculate just before it starts
auto sec_since_epoch = t.toMSecsSinceEpoch () / 1000 + 2; auto sec_since_epoch = t.toMSecsSinceEpoch () / 1000 + 2;
auto target_sec = sec_since_epoch - sec_since_epoch % TR_period + TR_period / 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 date {target_date_time.date().toString("yyyy MMM dd").trimmed ()};
QString utc {target_date_time.time().toString().trimmed ()}; QString utc {target_date_time.time().toString().trimmed ()};
int nyear {target_date_time.date().year()}; int nyear {target_date_time.date().year()};