w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 12:48:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Bill Somerville 2018-06-26 00:10:16 +01:00
commit 4f5c18aa6a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
astro.cpp
View File

@ -7,6 +7,7 @@
#include <QTextStream> #include <QTextStream>
#include <QSettings> #include <QSettings>
#include <QDateTime> #include <QDateTime>
#include <QTimeZone>
#include <QDir> #include <QDir>
#include <QCloseEvent> #include <QCloseEvent>
#include <QDebug> #include <QDebug>
@ -212,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); auto target_date_time = QDateTime::fromMSecsSinceEpoch (target_sec * 1000, QTimeZone::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()};