Added "Clear Band Map and Messages" to File menu.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@464 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-03 17:34:35 +00:00
parent c84e1e2369
commit 8f11360523
4 changed files with 38 additions and 24 deletions

View File

@ -30,6 +30,7 @@ subroutine ftn_init
! print*,'ftn_init.F90 nport=', nport, 'pttport=', pttport
i=ptt(nport,pttport,0,iptt) !Clear the PTT line
addpfx=' '
nrw26=0
do i=80,1,-1
if(AppDir(i:i).ne.' ') goto 1

View File

@ -45,7 +45,7 @@ integer nport !Requested COM port number GUI
integer mousedf !Mouse-selected freq offset, DF GUI
integer mousefqso !Mouse-selected QSO freq GUI
integer neme !EME calls only in deep search? GUI
integer nsked !Sked mode for deep search? GUI
integer nrw26 !Request to rewind lu 26 (tmp26.txt) GUI,Decoder
integer naggressive !Is "Aggressive decoding" checked? GUI
integer ntx2 !Is "No shorthands if Tx1" checked? GUI
integer nagain !Decode same file again? GUI
@ -94,7 +94,7 @@ common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), &
ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5, &
dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb, &
nclearave,nfreeze,nafc,newspec,nmode,mode65,nclip,ndebug,nblank, &
nport,mousedf,mousefqso,neme,nsked,naggressive,ntx2,nagain, &
nport,mousedf,mousefqso,neme,nrw26,naggressive,ntx2,nagain, &
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), &

View File

@ -168,22 +168,22 @@ def testmsgs():
#------------------------------------------------------
def messages(event=NONE):
global Version,bm,bm_geom,bmtext
global Version,bm,bm_geom,msgtext
bm=Toplevel(root)
bm.title("Messages")
bm.geometry(bm_geom)
if g.Win32: bm.iconbitmap("wsjt.ico")
iframe_bm1 = Frame(bm, bd=1, relief=SUNKEN)
bmtext=Text(iframe_bm1, height=35, width=41, bg="Navy", fg="yellow")
bmtext.bind('<Double-Button-1>',dbl_click_bmtext)
bmtext.pack(side=LEFT, fill=X, padx=1, pady=3)
bmsb = Scrollbar(iframe_bm1, orient=VERTICAL, command=bmtext.yview)
msgtext=Text(iframe_bm1, height=35, width=41, bg="Navy", fg="yellow")
msgtext.bind('<Double-Button-1>',dbl_click_msgtext)
msgtext.pack(side=LEFT, fill=X, padx=1, pady=3)
bmsb = Scrollbar(iframe_bm1, orient=VERTICAL, command=msgtext.yview)
bmsb.pack(side=RIGHT, fill=Y)
bmtext.configure(yscrollcommand=bmsb.set)
bmtext.tag_configure('age0',foreground='red')
bmtext.tag_configure('age1',foreground='yellow')
bmtext.tag_configure('age2',foreground='gray75')
bmtext.tag_configure('age3',foreground='gray50')
msgtext.configure(yscrollcommand=bmsb.set)
msgtext.tag_configure('age0',foreground='red')
msgtext.tag_configure('age1',foreground='yellow')
msgtext.tag_configure('age2',foreground='gray75')
msgtext.tag_configure('age3',foreground='gray50')
iframe_bm1.pack(expand=1, fill=X, padx=4)
#------------------------------------------------------ bandmap
@ -201,7 +201,7 @@ def bandmap(event=NONE):
bm2text.tag_configure('age1',foreground='yellow')
bm2text.tag_configure('age2',foreground='gray75')
bm2text.tag_configure('age3',foreground='gray50')
iframe_bm2.pack(expand=1, fill=X, padx=4)
iframe_bm2.pack(expand=1, fill=X, padx=4,pady=5)
#------------------------------------------------------ logqso
def logqso(event=NONE):
@ -235,10 +235,10 @@ def dbl_click_text(event):
t=text.get('1.0',END) #Entire contents of text box
t1=text.get('1.0',CURRENT) #Contents from start to cursor
dbl_click_call(t,t1,event)
#------------------------------------------------------ dbl_click_bmtext
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_msgtext
def dbl_click_msgtext(event):
t=msgtext.get('1.0',END) #Entire contents of text box
t1=msgtext.get('1.0',CURRENT) #Contents from start to cursor
dbl_click_call(t,t1,event)
#------------------------------------------------------ dbl_click_bm2text
def dbl_click_bm2text(event):
@ -784,6 +784,12 @@ def delwav():
def del_all():
Audio.gcom1.ns0=-999999
#------------------------------------------------------ clr_all
def clr_all():
Audio.gcom2.nrw26=1 #Request rewind of tmp26.txt
msgtext.delete('1.0',END)
bm2text.delete('1.0',END)
#------------------------------------------------------ toggleauto
def toggleauto(event=NONE):
global lauto
@ -987,7 +993,7 @@ def update():
txminute=0
if Audio.gcom2.lauto and utc[4]%2 == Audio.gcom1.txfirst: txminute=1
if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \
(isec>45 and (txminute==0 or Audio.gcom2.monitoring==0) and \
(isec>45 and txminute==0 and Audio.gcom2.monitoring==1 and \
Audio.datcom.kkdone!=-99 and Audio.gcom2.ndiskdat!=1)):
#Set button bg while decoding
bc='#66FFFF'
@ -1078,10 +1084,10 @@ def update():
f.close()
except:
lines=""
bmtext.configure(state=NORMAL)
bmtext.delete('1.0',END)
bmtext.insert(END,'Freq DF Pol UTC\n')
bmtext.insert(END,'----------------------------------------\n')
msgtext.configure(state=NORMAL)
msgtext.delete('1.0',END)
msgtext.insert(END,'Freq DF Pol UTC\n')
msgtext.insert(END,'----------------------------------------\n')
for i in range(len(lines)):
try:
nage=int(lines[i][41:])
@ -1092,8 +1098,8 @@ def update():
if nage==1: attr='age1'
if nage==2: attr='age2'
if nage>=3: attr='age3'
bmtext.insert(END,lines[i],attr)
bmtext.see(END)
msgtext.insert(END,lines[i],attr)
msgtext.see(END)
try:
f=open(appdir+'/bandmap.txt',mode='r')
@ -1200,6 +1206,8 @@ filemenu.add_separator()
filemenu.add('command', label = 'Delete all *.WAV files in RxWav', \
command = delwav)
filemenu.add_separator()
filemenu.add('command', label = 'Erase Band Map and Messages', command = clr_all)
filemenu.add_separator()
filemenu.add('command', label = 'Erase ALL65.TXT', command = del_all)
filemenu.add_separator()
filemenu.add('command', label = 'Exit', command = quit)

View File

@ -30,6 +30,11 @@ subroutine map65a(newdat)
rewind 11
rewind 12
if(nrw26.ne.0) then
print*,'Rewinding 26'
rewind 26
nrw26=0
endif
if(nutc.ne.nutc0) nfile=nfile+1
nutc0=nutc
nutcdata=nutc