w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-30 20:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct the sending of minsync to decoder. Fix statement ordering that affects timer calls.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7370 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-12-08 15:38:54 +00:00
parent bac33e7e19
commit 000976c184
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/decoder.f90
View File

@ -249,7 +249,7 @@ contains
if(ft.ge.80) then !QRA64 mode if(ft.ge.80) then !QRA64 mode
nft=ft-100 nft=ft-100
csync=': ' csync=': '
if(sync.ge.float(minsync) .or. nft.ge.0) csync=':*' if(sync-3.4.ge.float(minsync) .or. nft.ge.0) csync=':*'
if(nft.lt.0) then if(nft.lt.0) then
write(*,1009) params%nutc,snr,dt,freq,csync,decoded write(*,1009) params%nutc,snr,dt,freq,csync,decoded
else else

9
lib/qra64a.f90
View File

@ -23,8 +23,8 @@ subroutine qra64a(dd,npts,nutc,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth, &
data nc1z/-1/,nc2z/-1/,ng2z/-1/,maxaptypez/-1/ data nc1z/-1/,nc2z/-1/,ng2z/-1/,maxaptypez/-1/
save save
if(nfqso.lt.nf1 .or. nfqso.gt.nf2) go to 900
call timer('qra64a ',0) call timer('qra64a ',0)
if(nfqso.lt.nf1 .or. nfqso.gt.nf2) go to 900
decoded=' ' decoded=' '
nft=99 nft=99
nsnr=-30 nsnr=-30
@ -145,8 +145,9 @@ subroutine qra64a(dd,npts,nutc,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth, &
if(nSubmode.eq.2) nsnr=nint(10.0*log10(sy)-34.0) !C if(nSubmode.eq.2) nsnr=nint(10.0*log10(sy)-34.0) !C
if(nSubmode.eq.3) nsnr=nint(10.0*log10(sy)-29.0) !D if(nSubmode.eq.3) nsnr=nint(10.0*log10(sy)-29.0) !D
if(nSubmode.eq.4) nsnr=nint(10.0*log10(sy)-24.0) !E if(nSubmode.eq.4) nsnr=nint(10.0*log10(sy)-24.0) !E
endif endif
call timer('qra64a ',1)
900 return 900 call timer('qra64a ',1)
return
end subroutine qra64a end subroutine qra64a

3
mainwindow.cpp
View File

@ -984,7 +984,8 @@ void MainWindow::readSettings()
m_nSubMode=m_settings->value("SubMode",0).toInt(); m_nSubMode=m_settings->value("SubMode",0).toInt();
m_FtolIndex=m_settings->value("FtolIndex",21).toInt(); m_FtolIndex=m_settings->value("FtolIndex",21).toInt();
// ui->FTol_combo_box->setCurrentText(m_settings->value("FTol","500").toString ()); // ui->FTol_combo_box->setCurrentText(m_settings->value("FTol","500").toString ());
ui->syncSpinBox->setValue(m_settings->value("MinSync",0).toInt()); m_minSync=m_settings->value("MinSync",0).toInt();
ui->syncSpinBox->setValue(m_minSync);
ui->cbAutoSeq->setChecked (m_settings->value ("AutoSeq", false).toBool()); ui->cbAutoSeq->setChecked (m_settings->value ("AutoSeq", false).toBool());
m_bShMsgs=m_settings->value("ShMsgs",false).toBool(); m_bShMsgs=m_settings->value("ShMsgs",false).toBool();
m_bFast9=m_settings->value("Fast9",false).toBool(); m_bFast9=m_settings->value("Fast9",false).toBool();