From c79fe70549a8322e2ba4636a851e9f1584facfd0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 16 Jan 2017 20:27:03 +0000 Subject: [PATCH] Display UTC correctly on waterfall. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7516 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 2 +- plotter.cpp | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index e32eaece1..010fefd13 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/plotter.cpp b/plotter.cpp index 5ec412f37..0db891927 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -260,19 +260,15 @@ void CPlotter::UTCstr() { int ihr,imin,isec; if(datcom_.ndiskdat != 0) { - ihr=datcom_.nutc/10000; - imin=(datcom_.nutc/100) % 100; - isec=datcom_.nutc % 100; + ihr=datcom_.nutc/100; + imin=(datcom_.nutc) % 100; } else { qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; imin=ms/60000; ihr=imin/60; imin=imin % 60; - isec=(ms/1000) % 60; } - if(isec<30) isec=0; - if(isec>=30) isec=30; - sprintf(m_sutc,"%2.2d:%2.2d:%2.2d",ihr,imin,isec); + sprintf(m_sutc,"%2.2d:%2.2d",ihr,imin); } void CPlotter::DrawOverlay() //DrawOverlay()