w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Missed merge from develop branch conflict resolved

This commit is contained in:
Bill Somerville 2020-10-06 19:55:43 +01:00
parent 314be8ccb7
commit bb8e6ea64a
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
widgets/mainwindow.cpp
View File

@ -3046,27 +3046,6 @@ void MainWindow::decode() //decode()
dec_data.params.nutc=dec_data.params.nutc/100;
}
if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) {
<<<<<<< HEAD
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int imin=ms/60000;
int ihr=imin/60;
imin=imin % 60;
if(m_TRperiod>=60) imin=imin - (imin % (int(m_TRperiod)/60));
dec_data.params.nutc=100*ihr + imin;
if(m_TRperiod < 60) {
qint64 ms=1000.0*(3.5-m_TRperiod);
if(m_mode=="FST4") ms=1000.0*(6.0-m_TRperiod);
//Adjust for FT8 early decode:
if(m_mode=="FT8" and m_ihsym==m_earlyDecode and !m_diskData) ms+=(m_hsymStop-m_earlyDecode)*288;
if(m_mode=="FT8" and m_ihsym==m_earlyDecode2 and !m_diskData) ms+=(m_hsymStop-m_earlyDecode2)*288;
QDateTime t=QDateTime::currentDateTimeUtc().addMSecs(ms);
ihr=t.toString("hh").toInt();
imin=t.toString("mm").toInt();
int isec=t.toString("ss").toInt();
isec=isec - fmod(double(isec),m_TRperiod);
dec_data.params.nutc=10000*ihr + 100*imin + isec;
}
=======
auto t_start = qt_truncate_date_time_to (QDateTime::currentDateTimeUtc (), m_TRperiod * 1.e3);
auto t = t_start.time ();
dec_data.params.nutc = t.hour () * 100 + t.minute ();
@ -3074,7 +3053,6 @@ void MainWindow::decode() //decode()
{
dec_data.params.nutc = dec_data.params.nutc * 100 + t.second ();
}
>>>>>>> develop
}
if(m_nPick==1 and !m_diskData) {