From 8c440997eab7e31fe2c3a62f6a098f6f6237cd5e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 29 Sep 2011 13:15:51 +0000 Subject: [PATCH] Fix minor bug in display.F90. Adjust Rx noise time constant for i*2, r*4 data from Linrad. Remove unused GUI controls involved with average messages. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2449 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- display.F90 | 4 +-- map65.py | 96 ++++++++++++++++++++++++++--------------------------- recvpkt.F90 | 4 ++- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/display.F90 b/display.F90 index b92e07cdc..d188c0787 100644 --- a/display.F90 +++ b/display.F90 @@ -90,14 +90,14 @@ subroutine display(nkeep,ncsmin) call indexx(kz,utc2,indx2) k3=0 do k=1,kz - k3=k3+1 + k3=min(k3+1,500) line3(k3)=line2(indx2(k)) enddo nstart=0 else call indexx(kz,utc2,indx2) do k=1,kz - k3=k3+1 + k3=min(k3+1,500) line3(k3)=line2(indx2(k)) enddo endif diff --git a/map65.py b/map65.py index 8f8402729..2171c054c 100644 --- a/map65.py +++ b/map65.py @@ -284,11 +284,11 @@ def dbl_click_bmtext(event): t=bmtext.get('1.0',END) #Entire contents of text box t1=bmtext.get('1.0',CURRENT) #Contents from start to cursor dbl_click_call(t,t1,'OOO',3,event) -#------------------------------------------------------ dbl_click_ave -def dbl_click_ave(event): - t=avetext.get('1.0',END) #Entire contents of text box - t1=avetext.get('1.0',CURRENT) #Contents from start to cursor - dbl_click_call(t,t1,'OOO',1,event) +###------------------------------------------------------ dbl_click_ave +##def dbl_click_ave(event): +## t=avetext.get('1.0',END) #Entire contents of text box +## t1=avetext.get('1.0',CURRENT) #Contents from start to cursor +## dbl_click_call(t,t1,'OOO',1,event) #------------------------------------------------------ dbl_click_call def dbl_click_call(t,t1,rpt,nbox,event): global hiscall @@ -342,8 +342,8 @@ def dbl_click_call(t,t1,rpt,nbox,event): #----------------------------------------------------------- textkey def textkey(event=NONE): text.configure(state=DISABLED) -def avetextkey(event=NONE): - avetext.configure(state=DISABLED) +##def avetextkey(event=NONE): +## avetext.configure(state=DISABLED) #------------------------------------------------------ decode def decode(event=NONE): @@ -586,10 +586,10 @@ def ModeJT65(): global isync,itol cleartext() Audio.gcom1.trperiod=60 - iframe4b.pack(after=iframe4,expand=1, fill=X, padx=4) - bclravg.configure(state=NORMAL) - binclude.configure(state=NORMAL) - bexclude.configure(state=NORMAL) +## iframe4b.pack(after=iframe4,expand=1, fill=X, padx=4) +## bclravg.configure(state=NORMAL) +## binclude.configure(state=NORMAL) +## bexclude.configure(state=NORMAL) itol=4 inctol() nfreeze.set(0) @@ -813,19 +813,19 @@ def erase(event=NONE): text.configure(state=NORMAL) text.delete('1.0',END) text.configure(state=DISABLED) - avetext.configure(state=NORMAL) - avetext.delete('1.0',END) - avetext.configure(state=DISABLED) +## avetext.configure(state=NORMAL) +## avetext.delete('1.0',END) +## avetext.configure(state=DISABLED) Audio.gcom2.decodedfile=" " -#------------------------------------------------------ clear_avg -def clear_avg(event=NONE): - avetext.configure(state=NORMAL) - avetext.delete('1.0',END) - avetext.configure(state=DISABLED) - f=open(appdir+'/decoded.ave',mode='w') - f.truncate(0) #Delete contents of decoded.ave - f.close() - Audio.gcom2.nclearave=1 +###------------------------------------------------------ clear_avg +##def clear_avg(event=NONE): +## avetext.configure(state=NORMAL) +## avetext.delete('1.0',END) +## avetext.configure(state=DISABLED) +## f=open(appdir+'/decoded.ave',mode='w') +## f.truncate(0) #Delete contents of decoded.ave +## f.close() +## Audio.gcom2.nclearave=1 #------------------------------------------------------ delwav def delwav(): @@ -1189,12 +1189,12 @@ def update(): except: lines[0]="" lines[1]="" - avetext.configure(state=NORMAL) - avetext.delete('1.0',END) - if len(lines)>1: - avetext.insert(END,lines[0]) - avetext.insert(END,lines[1]) -# avetext.configure(state=DISABLED) +## avetext.configure(state=NORMAL) +## avetext.delete('1.0',END) +## if len(lines)>1: +## avetext.insert(END,lines[0]) +## avetext.insert(END,lines[1]) +### avetext.configure(state=DISABLED) cleartext() Audio.gcom2.ndecdone=0 @@ -1547,8 +1547,8 @@ root.bind_all('',btx6) root.bind_all('',toggleauto) root.bind_all('',toggleauto) -root.bind_all('',clear_avg) -root.bind_all('',clear_avg) +##root.bind_all('',clear_avg) +##root.bind_all('',clear_avg) root.bind_all('',decode) root.bind_all('',decode) root.bind_all('',erase) @@ -1590,15 +1590,15 @@ astrotext=Text(iframe4, bg="#66FFFF",height=10,width=11,font=astrotext_font) astrotext.pack(side=LEFT, fill=BOTH, padx=4) g2font=astrotext_font if g2font!="": g.g2font=g2font - iframe4.pack(expand=1, fill=X, padx=4) -iframe4b = Frame(frame, bd=2, relief=SUNKEN) -avetext=Text(iframe4b, height=2, width=65) -avetext.bind('',dbl_click_ave) -#avetext.bind('',dbl_click_ave) -avetext.bind('',avetextkey) -avetext.pack(side=LEFT, fill=X, padx=1) -iframe4b.pack(expand=1, fill=X, padx=4) + +##iframe4b = Frame(frame, bd=2, relief=SUNKEN) +##avetext=Text(iframe4b, height=2, width=65) +##avetext.bind('',dbl_click_ave) +###avetext.bind('',dbl_click_ave) +##avetext.bind('',avetextkey) +##avetext.pack(side=LEFT, fill=X, padx=1) +##iframe4b.pack(expand=1, fill=X, padx=4) #------------------------------------------------------- Button Bar iframe4c = Frame(frame, bd=1, relief=SUNKEN) @@ -1612,12 +1612,12 @@ bdecode=Button(iframe4c, text='Decode',underline=0,command=decode, padx=1,pady=1) berase=Button(iframe4c, text='Erase',underline=0,command=erase, padx=1,pady=1) -bclravg=Button(iframe4c, text='Clear Avg',underline=0,command=clear_avg, - padx=1,pady=1) -binclude=Button(iframe4c, text='Include',underline=0, - command=decode_include,padx=1,pady=1) -bexclude=Button(iframe4c, text='Exclude',underline=1, - command=decode_exclude,padx=1,pady=1) +##bclravg=Button(iframe4c, text='Clear Avg',underline=0,command=clear_avg, +## padx=1,pady=1) +##binclude=Button(iframe4c, text='Include',underline=0, +## command=decode_include,padx=1,pady=1) +##bexclude=Button(iframe4c, text='Exclude',underline=1, +## command=decode_exclude,padx=1,pady=1) btxstop=Button(iframe4c,text='TxStop',underline=4,command=txstop, padx=1,pady=1) @@ -1626,9 +1626,9 @@ bstop.pack(side=LEFT,expand=1,fill=X) bmonitor.pack(side=LEFT,expand=1,fill=X) bdecode.pack(side=LEFT,expand=1,fill=X) berase.pack(side=LEFT,expand=1,fill=X) -bclravg.pack(side=LEFT,expand=1,fill=X) -binclude.pack(side=LEFT,expand=1,fill=X) -bexclude.pack(side=LEFT,expand=1,fill=X) +##bclravg.pack(side=LEFT,expand=1,fill=X) +##binclude.pack(side=LEFT,expand=1,fill=X) +##bexclude.pack(side=LEFT,expand=1,fill=X) btxstop.pack(side=LEFT,expand=1,fill=X) iframe4c.pack(expand=1, fill=X, padx=4) diff --git a/recvpkt.F90 b/recvpkt.F90 index 77a76f734..ab0d0fc2f 100644 --- a/recvpkt.F90 +++ b/recvpkt.F90 @@ -19,7 +19,7 @@ subroutine recvpkt(iarg) equivalence (xd,c16) equivalence (buf8,buf16) data nblock0/0/,kb/1/,ns00/99/,first/.true./ - data sqave/0.0/,u/0.001/,rxnoise/0.0/,pctblank/0.0/,kbuf/1/,lost_tot/0/ + data sqave/0.0/,rxnoise/0.0/,pctblank/0.0/,kbuf/1/,lost_tot/0/ data multicast0/-99/ save @@ -131,6 +131,8 @@ subroutine recvpkt(iarg) endif enddo sq=sq/(2.0*iz) + u=0.001 + if(nfloat.ne.1) u=2.0*u sqave=sqave + u*(sq-sqave) rxnoise=10.0*log10(sqave) - 20.0 ! Was -48.0 kxp=k