Fix "Erase Band Map and Messages."

Clean up File menu.
Reduce shirthand signal levels by 6 dB.
Anchor text to W in callsign readout label.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@470 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-04 17:44:39 +00:00
parent 73a9da91ee
commit 6875afc771
4 changed files with 15 additions and 4840 deletions

4828
CALL3.TXT

File diff suppressed because it is too large Load Diff

View File

@ -1230,9 +1230,7 @@ filemenu.add('command', label = 'Decode remaining files in directory', \
filemenu.add_separator() filemenu.add_separator()
filemenu.add('command', label = 'Delete all *.WAV files in RxWav', \ filemenu.add('command', label = 'Delete all *.WAV files in RxWav', \
command = delwav) command = delwav)
filemenu.add_separator()
filemenu.add('command', label = 'Erase Band Map and Messages', command = clr_all) 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('command', label = 'Erase ALL65.TXT', command = del_all)
filemenu.add_separator() filemenu.add_separator()
filemenu.add('command', label = 'Exit', command = quit) filemenu.add('command', label = 'Exit', command = quit)
@ -1345,13 +1343,13 @@ helpmenu.add('command', label = 'Available suffixes and add-on prefixes', \
helpmenu.add('command', label = 'About MAP65', command = about, \ helpmenu.add('command', label = 'About MAP65', command = about, \
accelerator='Ctrl+F1') accelerator='Ctrl+F1')
#------------------------------------------------------ Labels under graphics #------------------------------------------------------ Label above text
iframe2 = Frame(frame, bd=1, relief=FLAT,height=15) iframe2 = Frame(frame, bd=1, relief=FLAT,height=15)
lab2=Label(iframe2, text='Freq DF Pol UTC DT dB') lab2=Label(iframe2, text='Freq DF Pol UTC DT dB')
lab2.place(x=3,y=6, anchor='w') lab2.place(x=3,y=6, anchor='w')
lab7=Label(iframe2,text='F3',fg='gray85') lab7=Label(iframe2,text='F3',fg='gray85')
lab7.place(x=495,y=6, anchor=CENTER) lab7.place(x=495,y=6, anchor=CENTER)
iframe2.pack(expand=1, fill=X, padx=4) iframe2.pack(expand=1, fill=BOTH, padx=4)
#-------------------------------------------------------- Decoded text #-------------------------------------------------------- Decoded text
iframe4 = Frame(frame, bd=2, relief=SUNKEN) iframe4 = Frame(frame, bd=2, relief=SUNKEN)

View File

@ -22,16 +22,17 @@ subroutine map65a(newdat)
data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/ data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/
save save
! if(nlost.ne.0) then
pctlost=nlost/331.03 pctlost=nlost/331.03
if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),60),nlost,pctlost if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),60),nlost,pctlost
3001 format('mod65a 1:',i5.4,i3.2,i8,f6.1,' %') 3001 format('mod65a 1:',i5.4,i3.2,i8,f6.1,' %')
! endif
rewind 11 rewind 11
rewind 12 rewind 12
if(nrw26.ne.0) rewind 26 if(nrw26.ne.0) then
endfile (26) !Compiler bug? Don't write "end file 26" !!!
rewind 26
nrw26=0 nrw26=0
endif
if(nutc.ne.nutc0) nfile=nfile+1 if(nutc.ne.nutc0) nfile=nfile+1
nutc0=nutc nutc0=nutc
@ -117,6 +118,8 @@ subroutine map65a(newdat)
fshort=0.001*((i0-1)*df - 23000) + 100.0 fshort=0.001*((i0-1)*df - 23000) + 100.0
! Keep only the best candidate within ftol. ! Keep only the best candidate within ftol.
!### NB: sync2 was not defined here!
!### sync2=syncshort !### try this ???
if(fshort-fshort0.le.ftol .and. sync2.gt.sync20 & if(fshort-fshort0.le.ftol .and. sync2.gt.sync20 &
.and. nkm.eq.2) km=km-1 .and. nkm.eq.2) km=km-1
if(fshort-fshort0.gt.ftol .or. & if(fshort-fshort0.gt.ftol .or. &
@ -295,6 +298,8 @@ subroutine map65a(newdat)
ndf2=nint(a(3)) ndf2=nint(a(3))
nsync1=sync1 nsync1=sync1
nsync2=nint(10.0*log10(sync2)) - 40 !### empirical ### nsync2=nint(10.0*log10(sync2)) - 40 !### empirical ###
if(decoded(1:4).eq.'RO ' .or. decoded(1:4).eq.'RRR ' .or. &
decoded(1:4).eq.'73 ') nsync2=nsync2-6
write(26,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, & write(26,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, &
nsync2,nutc,decoded,nkv,nqual,nhist nsync2,nutc,decoded,nkv,nqual,nhist
write(21,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, & write(21,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, &

View File

@ -380,9 +380,9 @@ setupmenu.add_radiobutton(label='Hot',command=pal_Hot,
setupmenu.add_radiobutton(label='AFMHot',command=pal_AFMHot, setupmenu.add_radiobutton(label='AFMHot',command=pal_AFMHot,
value=5,variable=npal) value=5,variable=npal)
lab1=Label(mbar,padx=20,bd=0) lab1=Label(mbar,width=20,padx=20,bd=0)
lab1.pack(side=LEFT) lab1.pack(side=LEFT)
fdf=Label(mbar,width=30,bd=0) fdf=Label(mbar,width=30,bd=0,anchor=W)
fdf.pack(side=LEFT) fdf.pack(side=LEFT)
fdf2=Label(mbar,width=15,bd=0) fdf2=Label(mbar,width=15,bd=0)
fdf2.pack(side=LEFT) fdf2.pack(side=LEFT)