diff --git a/libm65/map65a.f90 b/libm65/map65a.f90 index 6e9c46b40..50ed1d01a 100644 --- a/libm65/map65a.f90 +++ b/libm65/map65a.f90 @@ -221,8 +221,10 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & a,dt,pol,nkv,nhist,nsum,nsave,qual,decoded) call timer('decode1a',1) if(nqd.eq.2) then + call timer('qra64 ',0) call qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall, & hiscall,hisgrid) + call timer('qra64 ',1) cycle endif diff --git a/libm65/qra64c.f90 b/libm65/qra64c.f90 index 5e4f1c3b6..982c8dd0e 100644 --- a/libm65/qra64c.f90 +++ b/libm65/qra64c.f90 @@ -105,8 +105,10 @@ subroutine qra64c(cx,cy,nutc,nqd,ikhz,nfqso,ntol,xpol,mycall_12, & if(b90.gt.230.0) cycle if(b90.lt.0.15*width) exit s3(1:LL*NN)=s3a(1:LL*NN) + call timer('qra64_de',0) call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90, & nFadingModel,dat4,snr2,irc) + call timer('qra64_de',1) if(irc.eq.0) go to 10 if(irc.gt.0) call badmsg(irc,dat4,nc1,nc2,ng2) iirc=max(0,min(irc,11)) diff --git a/libm65/sync64.f90 b/libm65/sync64.f90 index 5ace65d75..dc07dcad6 100644 --- a/libm65/sync64.f90 +++ b/libm65/sync64.f90 @@ -45,19 +45,13 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, & nh3=nfft3/2 df3=6000.0/nfft3 -! fa=max(nf1,nfqso-ntol) -! fb=min(nf2,nfqso+ntol) - fa=nfqso-ntol - fb=nfqso+ntol - iaa=max(0,nint(fa/df3)+nh3) - ibb=min(NSPC-1,nint(fb/df3)+nh3) - write(74,3401) nf1,nf2,nfqso,ntol,iaa,ibb,fa,fb -3401 format(6i6,2f8.1) - flush(74) + faa=nfqso-ntol + fbb=nfqso+ntol + iaa=max(0,nint(faa/df3)+nh3) + ibb=min(NSPC-1,nint(fbb/df3)+nh3) - maxtol=max(ntol,500) - fa=max(nf1,nfqso-maxtol) - fb=min(nf2,nfqso+maxtol) + fa=-3000.0 + fb=3000.0 ia=max(0,nint(fa/df3)+nh3) ib=min(NSPC-1,nint(fb/df3)+nh3) @@ -125,7 +119,7 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, & call timer('sync64_2',1) enddo - s0a=s0a+2.0 +! s0a=s0a+2.0 ! write(17) ia,ib,s0a(ia:ib) !Save data for red curve ! close(17) @@ -161,12 +155,5 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, & enddo flush(76) - !### - write(75,3301) ntol,maxtol,nfqso,fa,fb,iaa*df3,ibb*df3,dtx,f0,sync -3301 format(3i6,7f8.1) - flush(75) -!### - - return end subroutine sync64 diff --git a/mainwindow.cpp b/mainwindow.cpp index cd2daba25..08b1addf4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"