w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 20:28:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correct a flaw in handling a warning about NA Contest Mode. This fix should go also to the v1.8.1 tag.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8314 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-11 14:15:31 +00:00
parent 7268d6d430
commit e514af2339
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions.cmake
View File

@ -1,6 +1,6 @@
# Version number components # Version number components
set (WSJTX_VERSION_MAJOR 1) set (WSJTX_VERSION_MAJOR 1)
set (WSJTX_VERSION_MINOR 7) set (WSJTX_VERSION_MINOR 8)
set (WSJTX_VERSION_PATCH 1) set (WSJTX_VERSION_PATCH 1)
set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions
set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

3
lib/mskrtd.f90
View File

@ -208,8 +208,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall, &
nsnrlast=nsnr nsnrlast=nsnr
if(.not. bshdecode) then if(.not. bshdecode) then
call update_hasharray(recent_calls,nrecent,nhasharray) call update_hasharray(recent_calls,nrecent,nhasharray)
! Should we call fix_contest_msg() only if bcontest is true? if(bcontest) call fix_contest_msg(mygrid,msgreceived)
call fix_contest_msg(mygrid,msgreceived)
endif endif
write(line,1020) nutc0,nsnr,tdec,nint(fest),decsym,msgreceived, & write(line,1020) nutc0,nsnr,tdec,nint(fest),decsym,msgreceived, &
navg,ncorrected,eyeopening,char(0) navg,ncorrected,eyeopening,char(0)

3
mainwindow.cpp
View File

@ -2671,7 +2671,6 @@ void MainWindow::decode() //decode()
narg[12]=0; narg[12]=0;
narg[13]=-1; narg[13]=-1;
narg[14]=m_config.aggressive(); narg[14]=m_config.aggressive();
qDebug() << "a2" << dec_data.params.nutc;
memcpy(d2b,dec_data.d2,2*360000); memcpy(d2b,dec_data.d2,2*360000);
watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0], watcher3.setFuture (QtConcurrent::run (std::bind (fast_decode_,&d2b[0],
&narg[0],&m_TRperiod,&m_msg[0][0], &narg[0],&m_TRperiod,&m_msg[0][0],
@ -3917,7 +3916,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
warnMsg=tr("Should you be operating in NA VHF Contest mode?"); warnMsg=tr("Should you be operating in NA VHF Contest mode?");
nWarn=1; nWarn=1;
} }
if((m_mode=="FT8" or m_mode=="MSK144") and hisgrid.length()==4 and if((m_mode=="FT8" or m_mode=="MSK144") and hisgrid.contains(grid_regexp) and
m_rigState.frequency()>50000000 and !m_bCheckedContest) { m_rigState.frequency()>50000000 and !m_bCheckedContest) {
double utch=0.0; double utch=0.0;
int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter; int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter;