From e36cd03a37bbfbc414b648b3c610fb36cc423f52 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 29 Jun 2007 13:21:49 +0000 Subject: [PATCH] Trying to make on-the-fly work. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@437 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- decode1.F90 | 5 ++++- decode1a.f | 16 ---------------- four2a.f | 6 +++++- getfile2.F90 | 3 --- map65.py | 2 ++ symspec.f | 3 +++ 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/decode1.F90 b/decode1.F90 index 3b84fdf2c..eb9abf113 100644 --- a/decode1.F90 +++ b/decode1.F90 @@ -25,6 +25,10 @@ subroutine decode1(iarg) 10 continue if(newdat2.gt.0) then call getfile2(fname80,nlen) + newdat2=0 + kbuf=1 + kk=NSMAX + kkdone=0 newdat=1 endif @@ -36,7 +40,6 @@ subroutine decode1(iarg) call map65a(newdat) if(mousebutton.eq.0) ndecoding0=ndecoding ndecoding=0 - newdat2=0 endif if(ns0.lt.0) then diff --git a/decode1a.f b/decode1a.f index aafc3a69a..f5b8abcc7 100644 --- a/decode1a.f +++ b/decode1a.f @@ -86,25 +86,9 @@ C Find best DF, f1, f2, DT, and pol if(i0.lt.1) i0=1 nz=n6+1-i0 -! ip0=ipol -! nflip=1 call afc65b(c5x(i0),c5y(i0),nz,fsample,nflip,ipol,a,dt, + ccfbest,dtbest) -! nflip=-1 -! ipol=ip0 -! call afc65b(c5x(i0),c5y(i0),nz,fsample,nflip,ipol,a,dt, -! + ccfbest2,dtbest) -! -! if(ccfbest2.lt.ccfbest) then -! nflip=1 -! ipol=ip0 -! call afc65b(c5x(i0),c5y(i0),nz,fsample,nflip,ipol,a,dt, -! + ccfbest,dtbest) -! else -! ccfbest=ccfbest -! endif - pol=a(4)/57.2957795 aa=cos(pol) bb=sin(pol) diff --git a/four2a.f b/four2a.f index 0c9208983..9f2a095b5 100644 --- a/four2a.f +++ b/four2a.f @@ -50,6 +50,7 @@ C Planning: FFTW_ESTIMATE, FFTW_MEASURE, FFTW_PATIENT, FFTW_EXHAUSTIVE aa(j)=a(j) enddo endif + call sleep_msec(0) if(isign.eq.-1 .and. iform.eq.1) then call sfftw_plan_dft_1d_(plan(i),nfft,a,a, + FFTW_FORWARD,nspeed) @@ -63,6 +64,7 @@ C Planning: FFTW_ESTIMATE, FFTW_MEASURE, FFTW_PATIENT, FFTW_EXHAUSTIVE else stop 'Unsupported request in four2a' endif + call sleep_msec(0) i=nplan if(nfft.le.32768) then do j=1,nfft @@ -70,7 +72,9 @@ C Planning: FFTW_ESTIMATE, FFTW_MEASURE, FFTW_PATIENT, FFTW_EXHAUSTIVE enddo endif - 10 call sfftw_execute_(plan(i)) + 10 call sleep_msec(0) + call sfftw_execute_(plan(i)) + call sleep_msec(0) return 999 do i=1,nplan diff --git a/getfile2.F90 b/getfile2.F90 index 7a96ba4f7..f17d3c1ba 100644 --- a/getfile2.F90 +++ b/getfile2.F90 @@ -49,9 +49,6 @@ subroutine getfile2(fname,len) #endif read(filename(8:11),*) nutc - kbuf=1 - kk=NSMAX - kkdone=0 ndiskdat=1 ndecoding=4 mousebutton=0 diff --git a/map65.py b/map65.py index 252f8c74f..27999a463 100644 --- a/map65.py +++ b/map65.py @@ -317,6 +317,8 @@ def openfile(event=NONE): Audio.getfile(fname,len(fname)) if Audio.gcom2.ierr: print 'Error ',Audio.gcom2.ierr, \ 'when trying to read file',fname + bdecode.configure(bg='#66FFFF',activebackground='#66FFFF', \ + state=DISABLED) mrudir=os.path.dirname(fname) fileopened=os.path.basename(fname) os.chdir(appdir) diff --git a/symspec.f b/symspec.f index 8e63b9635..089c933a6 100644 --- a/symspec.f +++ b/symspec.f @@ -93,7 +93,10 @@ C Compute spectra at four polarizations, using half-symbol steps. ndecoding=1 go to 999 endif + kkdone=i1-1 call sleep_msec(0) + write(81,3001) n,kbuf,kk,kkdone + 3001 format(4i10) enddo 999 kkdone=i1-1