From 82ecc6afcf93dfd23aa38a4ad399408a9ba5cd2f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 8 Dec 2016 15:38:54 +0000 Subject: [PATCH] Correct the sending of minsync to decoder. Fix statement ordering that affects timer calls. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7370 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decoder.f90 | 2 +- lib/qra64a.f90 | 9 +++++---- mainwindow.cpp | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 630e15fc8..345161bff 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -249,7 +249,7 @@ contains if(ft.ge.80) then !QRA64 mode nft=ft-100 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 write(*,1009) params%nutc,snr,dt,freq,csync,decoded else diff --git a/lib/qra64a.f90 b/lib/qra64a.f90 index dd21b7833..d42a4f354 100644 --- a/lib/qra64a.f90 +++ b/lib/qra64a.f90 @@ -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/ save - if(nfqso.lt.nf1 .or. nfqso.gt.nf2) go to 900 call timer('qra64a ',0) + if(nfqso.lt.nf1 .or. nfqso.gt.nf2) go to 900 decoded=' ' nft=99 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.3) nsnr=nint(10.0*log10(sy)-29.0) !D if(nSubmode.eq.4) nsnr=nint(10.0*log10(sy)-24.0) !E - endif - call timer('qra64a ',1) + endif -900 return +900 call timer('qra64a ',1) + + return end subroutine qra64a diff --git a/mainwindow.cpp b/mainwindow.cpp index 56d4413c2..a9b419831 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -984,7 +984,8 @@ void MainWindow::readSettings() m_nSubMode=m_settings->value("SubMode",0).toInt(); m_FtolIndex=m_settings->value("FtolIndex",21).toInt(); // 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()); m_bShMsgs=m_settings->value("ShMsgs",false).toBool(); m_bFast9=m_settings->value("Fast9",false).toBool();