Tidied up cut-off criteria

This commit is contained in:
Bill Somerville 2019-05-29 20:47:11 +01:00
parent 8035880c45
commit a54140582a
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F

View File

@ -997,16 +997,13 @@ void MainWindow::not_GA_warning_message ()
"be nonfunctional during the 2019 ARRL June VHF contest " "be nonfunctional during the 2019 ARRL June VHF contest "
"(June 8-10) and Field Day (June 22-23) weekends. It " "(June 8-10) and Field Day (June 22-23) weekends. It "
"will be permanently nonfunctional after July 21, 2019."); "will be permanently nonfunctional after July 21, 2019.");
QDateTime now=QDateTime::currentDateTimeUtc(); auto now = QDateTime::currentDateTimeUtc ();
QDateTime t1(QDate(2019,6,8),QTime(18,0)); if ((QDateTime {{2019, 6, 8}, {18, 0}, Qt::UTC} <= now
QDateTime t2(QDate(2019,6,10),QTime(3,0)); && now < QDateTime {{2019, 6, 10}, {3, 0}, Qt::UTC})
if(now.secsTo(t1)<0 and now.secsTo(t2)>0) Q_EMIT finished(); || now >= QDateTime {{2019, 7, 21}, {0, 0}, Qt::UTC})
t1=QDateTime(QDate(2019,6,22),QTime(18,0)); {
t2=QDateTime(QDate(2019,6,23),QTime(21,0)); Q_EMIT finished ();
if(now.secsTo(t1)<0 and now.secsTo(t2)>0) Q_EMIT finished(); }
QDateTime timeout(QDate(2019,7,21),QTime(0,0));
if(now.daysTo(timeout) < 0) Q_EMIT finished();
} }
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()