From 9387ef21c24e25f7911b749830a8581d196dcdfa Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sun, 14 Jan 2007 16:53:10 +0000 Subject: [PATCH] Fixed waterfall display problem. Fixed "decode all remaining files" timing problem. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@352 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- gcom2.f90 | 7 ++++--- map65.py | 6 +++--- map65a.f90 | 10 ++++++++-- spec.f90 | 10 +++++----- specjt.py | 17 +++++++++++------ 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/gcom2.f90 b/gcom2.f90 index 275fc2d6f..2db57ca9f 100644 --- a/gcom2.f90 +++ b/gcom2.f90 @@ -46,7 +46,6 @@ integer neme !EME calls only in deep search? GUI integer nsked !Sked mode for deep search? GUI integer naggressive !Is "Aggressive decoding" checked? GUI integer ntx2 !Is "No shorthands if Tx1" checked? GUI -integer nslim2 !2nd Decoder threshold for FSK441. JT6M GUI integer nagain !Decode same file again? GUI integer nsavelast !Save last file? GUI integer shok !Shorthand messages OK? GUI @@ -86,17 +85,19 @@ character*80 AppDir !WSJT installation directory GUI character*80 filetokilla !Filenames (full path) Decoder character*80 filetokillb character*12 pttport +character*8 utcdata !HHMM UTC for the processed data Decoder common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), & green(500),fselect,ngreen,dgain,iter,ndecoding,ndecoding0,mousebutton, & ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, & dftolerance,LDecoded,rxdone,monitoring,nzap,nsavecum,minsigdb, & nclearave,nfreeze,nafc,newspec,nmode,mode65,nclip,ndebug,nblank,nport, & - mousedf,neme,nsked,naggressive,ntx2,nslim2,nagain,nsavelast, & + mousedf,neme,nsked,naggressive,ntx2,nagain,nsavelast, & shok,sendingsh,d2a(661500),d2b(661500),b(60000),jza,jzb,ntime, & idinterval,msmax,lenappdir,idf,ndiskdat,nlines,nflat,ntxreq,ntxnow, & ndepth,nspecial,ndf,nfmid,nfrange,ss1(-224:224),ss2(-224:224), & mycall,hiscall,hisgrid,txmsg,sending,mode,fname0,fnamea, & - fnameb,decodedfile,AppDir,filetokilla,filetokillb,utcdate,pttport + fnameb,decodedfile,AppDir,filetokilla,filetokillb,utcdate,pttport, & + utcdata !### volatile /gcom2/ diff --git a/map65.py b/map65.py index dbfdf15e5..f39de1a89 100644 --- a/map65.py +++ b/map65.py @@ -1268,14 +1268,14 @@ def update(): bmtext.insert(END,lines[i]) bmtext.see(END) Audio.gcom2.ndecdone=0 + if loopall: opennext() + nopen=0 if g.cmap != cmap0: im.putpalette(g.palette) cmap0=g.cmap - plot_large() - if loopall: opennext() - nopen=0 +# plot_large() # Save some parameters g.mode=mode.get() diff --git a/map65a.f90 b/map65a.f90 index 4dbe0b660..09aa0cb1f 100644 --- a/map65a.f90 +++ b/map65a.f90 @@ -22,21 +22,27 @@ subroutine map65a common/spcom/ip0,ss(4,322,NFFT) !169 MB: half-symbol spectra data blank/' '/ data shmsg0/'ATT','RO ','RRR','73 '/ - data nfile/0/,nutc0/-999/ + data nfile/0/,nutc0/-999/,nid/0/ save include 'gcom2.f90' + if(newdat2.gt.0) nid=1 + if(nid.eq.0) go to 999 rewind 11 rewind 12 if(nutc.ne.nutc0) nfile=nfile+1 nutc0=nutc + nutcdata=nutc + write(utcdata,1001) nutc +1001 format(i4.4) + utcdata=utcdata(1:2)//':'//utcdata(3:4) tskip=0. ! fselect=126.0 + 1.6 + 0.290 ! nflip=-1 ! ip0=1 - fselect=128.0 + 1.6 + 0.220 + fselect=128.0 + 1.6 + 0.220 !AA1YN nflip=1 ip0=3 ! fselect=155.0 + 1.6 + 0.454 diff --git a/spec.f90 b/spec.f90 index 71ba70b71..ca66fece2 100644 --- a/spec.f90 +++ b/spec.f90 @@ -21,7 +21,7 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) include 'gcom3.f90' include 'gcom4.f90' data first/.true./ - data nstep/40,20,10,5,3/ !Integration limits + data nstep/28,20,14,10,7/ !Integration limits save if(first) then @@ -39,11 +39,11 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) ia=imid-374 ib=ia+749 - do n=1,nadd - do j=1,nlines + do j=1,nlines + do n=1,nadd k=k+1 do i=1,NFFT - s(i,j)=s(i,j) + ss(3,k,i) + s(i,j)=s(i,j) + ss(2,k,i) !### ip value is temporary ### enddo enddo enddo @@ -60,7 +60,7 @@ subroutine spec(brightness,contrast,ngain,nspeed,a,a2) k=0 fac=20.0/nadd nbpp=NFFT/NX !Bins per pixel in wide waterfall - do j=1,nlines + do j=nlines,1,-1 !Reverse order so last will be on top do i=1,NX k=k+1 diff --git a/specjt.py b/specjt.py index bbaed4397..cecf429fa 100644 --- a/specjt.py +++ b/specjt.py @@ -268,13 +268,18 @@ def update(): if newMinute: draw.line((0,0,749,0),fill=128) #Draw the minute separator draw2.line((0,0,749,0),fill=128) #Draw the minute separator - if nscroll == 13: - draw.text((5,2),t0[0:5],fill=253) #Insert time label - draw2.text((5,2),t0[0:5],fill=253) #Insert time label +# if nscroll == 13: +# draw.text((5,2),t0[0:5],fill=253) #Insert time label +# draw2.text((5,2),t0[0:5],fill=253) #Insert time label else: draw.line((0,0,749,0),fill=128) #Draw the minute separator draw2.line((0,0,749,0),fill=128) #Draw the minute separator + t=g.ftnstr(Audio.gcom2.utcdata) + draw.text((4,1),t[0:5],fill=253) #Insert time label + draw2.text((4,1),t[0:5],fill=253) #Insert time label + + pim=ImageTk.PhotoImage(im) #Convert Image to PhotoImage graph1.delete(ALL) pim2=ImageTk.PhotoImage(im2) #Convert Image to PhotoImage @@ -326,10 +331,10 @@ def update(): #-------------------------------------------------------- draw_axis def draw_axis(): c.delete(ALL) - xmid=125.0 - 2.1 #Empirical + xmid=125.0 - 2.3 #Empirical bw=96.0 - x1=int(xmid-0.5*bw) - x2=int(xmid+0.5*bw) + x1=int(xmid-0.6*bw) + x2=int(xmid+0.6*bw) xdf=bw/NX #128 Hz for ix in range(x1,x2,1): i=0.5*NX + (ix-xmid)/xdf