1. Document variables in gcom1.f90

2. Remove "Accelerated decoding" as menu item (now always ON)
3. Clean up a few unused variables
4. Change from MS Sans Serif to Helvetica fonts
5. Make Tx msg boxes wider


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/WSJT/trunk@15 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2005-12-27 14:11:33 +00:00
parent 0d93735ba0
commit 01798a7b64
6 changed files with 48 additions and 52 deletions

2
g1.bat
View File

@ -1,4 +1,4 @@
df /fpp /define:Win32 makedate.f90 df /fpp /define:Win32 makedate.f90
makedate makedate
cl /c /DWin32 /Fojtaudio.o jtaudio.c cl /c /DWin32 /Fojtaudio.o jtaudio.c
f2py.py -c --quiet --opt="/traceback /fast /fpp /define:Win32" init_rs.o encode_rs.o decode_rs.o jtaudio.o -lwinmm -lpa -lfftw3single -llibsamplerate -m Audio --"fcompiler=compaqv" only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 makedate_sub : a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 i1tor4.f90 makedate_sub.f90 rfile.f90 savedata.f90 spec.f90 wsjtgen.f90 runqqq.f90 wsjt1.f fsubs1.f fsubs.f astro.f astropak.f resample.c ptt.c wrapkarn.c fivehz.f90 f2py.py -c --quiet --opt="/traceback /fast /fpp /define:Win32" init_rs.o encode_rs.o decode_rs.o jtaudio.o -lwinmm -lpa -llibsamplerate -m Audio --"fcompiler=compaqv" only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 makedate_sub : a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 i1tor4.f90 makedate_sub.f90 rfile.f90 savedata.f90 spec.f90 wsjtgen.f90 runqqq.f90 wsjt1.f fsubs1.f fsubs.f astro.f astropak.f resample.c ptt.c wrapkarn.c fivehz.f90

View File

@ -1,36 +1,37 @@
parameter(NRxMax=2048*1024) parameter(NRxMax=2048*1024)
parameter(NTxMax=150*11025) parameter(NTxMax=150*11025)
real*8 Tsec !Present time ! Variable Purpose Set in Thread
real*8 tbuf !---------------------------------------------------------------------------
real*8 rxdelay real*8 Tsec !Present time SoundIn, SoundOut
real*8 txdelay real*8 tbuf !Tsec at time of input callback SoundIn
real*8 samfacin real*8 rxdelay !Delay between PTT=1 and Tx audio SoundIn
real*8 samfacout real*8 txdelay !Delay from end of Tx Audio and PTT=0 SOundOut
integer*2 y1 !Rx audio samples (ring buffer) real*8 samfacin !(Input sample rate)/11025 GUI
integer*2 y2 !WWVB or 1 PPS signal real*8 samfacout !(Output sample rate)/11025 GUI
integer iwrite !Pointer to ring buffer integer*2 y1 !Ring buffer for audio channel 0 SoundIn
integer*2 iwave !Tx data integer*2 y2 !Ring buffer for audio channel 1 SoundIn
integer nwave !Length of Tx data integer iwrite !Write pointer to ring buffer SoundIn
integer TxOK !OK to transmit? integer*2 iwave !Data for audio output SoundIn
integer TxFirst !Transmit first? integer nwave !Number of samples in iwave SoundIn
integer Receiving !Actually receiving? integer TxOK !OK to transmit? SoundIn
integer Transmitting !Actually transmitting? ! NB: TxOK=1 only in SoundIn; TxOK=0 also in GUI
integer TRPeriod !Tx or Rx period in seconds integer TxFirst !Transmit first? GUI
integer level !S-meter level, 0-100 integer Receiving !Actually receiving? SoundIn
integer mute !True means "don't transmit" integer Transmitting !Actually transmitting? SoundOut
integer ndsec !Dsec in units of 0.1 s integer TRPeriod !Tx or Rx period in seconds GUI
integer newdat !True if waterfall should scroll integer level !S-meter level, 0-100 GUI
integer mfsample !Measured sample rate, input integer mute !True means "don't transmit" GUI
integer mfsample2 !Measured sample rate, output integer ndsec !Dsec in units of 0.1 s GUI
character*8 cversion !Program version integer newdat !New data available for waterfall? GUI
integer mfsample !Measured sample rate, input SoundIn
integer mfsample2 !Measured sample rate, output SoundOut
common/gcom1/Tbuf(1024),ntrbuf(1024),Tsec,rxdelay,txdelay, & common/gcom1/Tbuf(1024),ntrbuf(1024),Tsec,rxdelay,txdelay, &
samfacin,samfacout,y1(NRxMax),y2(NRxMax), & samfacin,samfacout,y1(NRxMax),y2(NRxMax), &
nmax,iwrite,iread,iwave(NTXMAX),nwave,TxOK,Receiving,Transmitting, & nmax,iwrite,iread,iwave(NTXMAX),nwave,TxOK,Receiving,Transmitting, &
TxFirst,TRPeriod,ibuf,ibuf0,ave,rms,ngo,level,mute,newdat,ndsec, & TxFirst,TRPeriod,ibuf,ibuf0,ave,rms,ngo,level,mute,newdat,ndsec, &
ndevin,ndevout,nx,mfsample,mfsample2,ns0, & ndevin,ndevout,nx,mfsample,mfsample2,ns0
cversion
!### volatile /gcom1/ !### volatile /gcom1/

View File

@ -1,3 +1,7 @@
! Variable Purpose Set by
!-------------------------------------------------------------------------
real ps0 !Spectrum of best ping, FSK441/JT6m wsjt1
real psavg !Average spectrum wsjt1
integer*2 d2a,d2b,b integer*2 d2a,d2b,b
integer shok,sendingsh integer shok,sendingsh
integer dftolerance integer dftolerance

View File

@ -47,7 +47,6 @@ subroutine spec(brightness,contrast,logmap,ngain,nspeed,a)
fac=2.0/10000. fac=2.0/10000.
nsum=0 nsum=0
iread=0 iread=0
cversion='5.5.0 '
first=.false. first=.false.
b0=-999 b0=-999
c0=-999 c0=-999

View File

@ -247,8 +247,7 @@ def update():
if minsep.get(): if minsep.get():
draw.line((0,0,749,0),fill=128) #Draw the minute separator draw.line((0,0,749,0),fill=128) #Draw the minute separator
# Don't update display while decoding on a slow computer # Don't update waterfall while decoding
if Audio.gcom2.ndecoding==0 or g.naccel==0 or Audio.gcom2.ndiskdat:
pim=ImageTk.PhotoImage(im) #Convert Image to PhotoImage pim=ImageTk.PhotoImage(im) #Convert Image to PhotoImage
graph1.delete(ALL) graph1.delete(ALL)
#For some reason, top two lines are invisible, so we move down 2 #For some reason, top two lines are invisible, so we move down 2

31
wsjt.py
View File

@ -44,10 +44,10 @@ idsec=0
lauto=0 lauto=0
cmap0="Linrad" cmap0="Linrad"
fileopened="" fileopened=""
#font1='Arial' font1='Helvetica'
#font2='Arial' font2='Helcetica'
font1=('MS', 'Sans', 'Serif') #font1=('MS', 'Sans', 'Serif')
font2=('MS', 'Sans', 'Serif') #font2=('MS', 'Sans', 'Serif')
font3='Courier' font3='Courier'
hiscall="" hiscall=""
hisgrid="" hisgrid=""
@ -77,7 +77,6 @@ nopen=0
nosh441=IntVar() nosh441=IntVar()
noshjt65=IntVar() noshjt65=IntVar()
nsked=IntVar() nsked=IntVar()
naccel=IntVar()
setseq=IntVar() setseq=IntVar()
ShOK=IntVar() ShOK=IntVar()
slabel="Sync " slabel="Sync "
@ -91,7 +90,6 @@ balloon=Pmw.Balloon(root)
g.freeze_decode=0 g.freeze_decode=0
g.mode="" g.mode=""
g.naccel=1
g.ndevin=IntVar() g.ndevin=IntVar()
g.ndevout=IntVar() g.ndevout=IntVar()
@ -925,11 +923,11 @@ def dtdf_change(event):
t="%.1f" % (event.x*30.0/500.0,) t="%.1f" % (event.x*30.0/500.0,)
lab6.configure(text=t,bg='green') lab6.configure(text=t,bg='green')
else: else:
if event.y<60 and Audio.gcom2.nspecial==0: if event.y<40 and Audio.gcom2.nspecial==0:
lab1.configure(text='Time (s)',bg="#33FFFF") #light blue lab1.configure(text='Time (s)',bg="#33FFFF") #light blue
t="%.1f" % (12.0*event.x/500.0-2.0,) t="%.1f" % (12.0*event.x/500.0-2.0,)
lab6.configure(text=t,bg="#33FFFF") lab6.configure(text=t,bg="#33FFFF")
elif (event.y>=60 and event.y<95) or \ elif (event.y>=40 and event.y<95) or \
(event.y<95 and Audio.gcom2.nspecial>0): (event.y<95 and Audio.gcom2.nspecial>0):
lab1.configure(text='DF (Hz)',bg='red') lab1.configure(text='DF (Hz)',bg='red')
t="%d" % int(1200.0*event.x/500.0-600.0,) t="%d" % int(1200.0*event.x/500.0-600.0,)
@ -1204,7 +1202,6 @@ def update():
options.MyGrid.get().upper(),HisGrid.get().upper(),utchours) options.MyGrid.get().upper(),HisGrid.get().upper(),utchours)
azdist() azdist()
g.nfreq=nfreq.get() g.nfreq=nfreq.get()
g.naccel=naccel.get()
g.AzSun,g.ElSun,g.AzMoon,g.ElMoon,g.AzMoonB,g.ElMoonB,g.ntsky, \ g.AzSun,g.ElSun,g.AzMoon,g.ElMoon,g.AzMoonB,g.ElMoonB,g.ntsky, \
g.ndop,g.ndop00,g.dbMoon,g.RAMoon,g.DecMoon,g.HA8,g.Dgrd, \ g.ndop,g.ndop00,g.dbMoon,g.RAMoon,g.DecMoon,g.HA8,g.Dgrd, \
@ -1469,7 +1466,6 @@ setupmenu.add_checkbutton(label = 'Double-click on callsign sets TxFirst',
variable=setseq) variable=setseq)
setupmenu.add_checkbutton(label = 'GenStdMsgs sets Tx1',variable=k2txb) setupmenu.add_checkbutton(label = 'GenStdMsgs sets Tx1',variable=k2txb)
setupmenu.add_separator() setupmenu.add_separator()
setupmenu.add_checkbutton(label = 'Accelerated decoding',variable=naccel)
setupmenu.add_checkbutton(label = 'Enable diagnostics',variable=ndebug) setupmenu.add_checkbutton(label = 'Enable diagnostics',variable=ndebug)
#------------------------------------------------------ View menu #------------------------------------------------------ View menu
@ -1796,42 +1792,42 @@ auto.grid(column=0,row=5,sticky='EW',padx=4)
#txstop.grid(column=0,row=6,sticky='EW',padx=4) #txstop.grid(column=0,row=6,sticky='EW',padx=4)
ntx=IntVar() ntx=IntVar()
tx1=Entry(f5c,width=22, font=(font2,9)) tx1=Entry(f5c,width=28, font=(font2,9))
rb1=Radiobutton(f5c,value=1,variable=ntx) rb1=Radiobutton(f5c,value=1,variable=ntx)
b1=Button(f5c, text='Tx1',underline=2,command=btx1,padx=1,pady=1) b1=Button(f5c, text='Tx1',underline=2,command=btx1,padx=1,pady=1)
tx1.grid(column=1,row=0) tx1.grid(column=1,row=0)
rb1.grid(column=2,row=0) rb1.grid(column=2,row=0)
b1.grid(column=3,row=0) b1.grid(column=3,row=0)
tx2=Entry(f5c,width=22, font=(font2,9)) tx2=Entry(f5c,width=28, font=(font2,9))
rb2=Radiobutton(f5c,value=2,variable=ntx) rb2=Radiobutton(f5c,value=2,variable=ntx)
b2=Button(f5c, text='Tx2',underline=2,command=btx2,padx=1,pady=1) b2=Button(f5c, text='Tx2',underline=2,command=btx2,padx=1,pady=1)
tx2.grid(column=1,row=1) tx2.grid(column=1,row=1)
rb2.grid(column=2,row=1) rb2.grid(column=2,row=1)
b2.grid(column=3,row=1) b2.grid(column=3,row=1)
tx3=Entry(f5c,width=22, font=(font2,9)) tx3=Entry(f5c,width=28, font=(font2,9))
rb3=Radiobutton(f5c,value=3,variable=ntx) rb3=Radiobutton(f5c,value=3,variable=ntx)
b3=Button(f5c, text='Tx3',underline=2,command=btx3,padx=1,pady=1) b3=Button(f5c, text='Tx3',underline=2,command=btx3,padx=1,pady=1)
tx3.grid(column=1,row=2) tx3.grid(column=1,row=2)
rb3.grid(column=2,row=2) rb3.grid(column=2,row=2)
b3.grid(column=3,row=2) b3.grid(column=3,row=2)
tx4=Entry(f5c,width=22, font=(font2,9)) tx4=Entry(f5c,width=28, font=(font2,9))
rb4=Radiobutton(f5c,value=4,variable=ntx) rb4=Radiobutton(f5c,value=4,variable=ntx)
b4=Button(f5c, text='Tx4',underline=2,command=btx4,padx=1,pady=1) b4=Button(f5c, text='Tx4',underline=2,command=btx4,padx=1,pady=1)
tx4.grid(column=1,row=3) tx4.grid(column=1,row=3)
rb4.grid(column=2,row=3) rb4.grid(column=2,row=3)
b4.grid(column=3,row=3) b4.grid(column=3,row=3)
tx5=Entry(f5c,width=22, font=(font2,9)) tx5=Entry(f5c,width=28, font=(font2,9))
rb5=Radiobutton(f5c,value=5,variable=ntx) rb5=Radiobutton(f5c,value=5,variable=ntx)
b5=Button(f5c, text='Tx5',underline=2,command=btx5,padx=1,pady=1) b5=Button(f5c, text='Tx5',underline=2,command=btx5,padx=1,pady=1)
tx5.grid(column=1,row=4) tx5.grid(column=1,row=4)
rb5.grid(column=2,row=4) rb5.grid(column=2,row=4)
b5.grid(column=3,row=4) b5.grid(column=3,row=4)
tx6=Entry(f5c,width=22, font=(font2,9)) tx6=Entry(f5c,width=28, font=(font2,9))
rb6=Radiobutton(f5c,value=6,variable=ntx) rb6=Radiobutton(f5c,value=6,variable=ntx)
b6=Button(f5c, text='Tx6',underline=2,command=btx6,padx=1,pady=1) b6=Button(f5c, text='Tx6',underline=2,command=btx6,padx=1,pady=1)
tx6.grid(column=1,row=5) tx6.grid(column=1,row=5)
@ -1864,7 +1860,6 @@ ldate.after(100,update)
lauto=0 lauto=0
isync=1 isync=1
ntx.set(1) ntx.set(1)
naccel.set(1)
ndepth.set(2) ndepth.set(2)
import options import options
@ -1962,7 +1957,6 @@ try:
elif key == 'Aggressive': naggressive.set(value) elif key == 'Aggressive': naggressive.set(value)
elif key == 'NEME': neme.set(value) elif key == 'NEME': neme.set(value)
elif key == 'NDepth': ndepth.set(value) elif key == 'NDepth': ndepth.set(value)
elif key == 'Accelerate': naccel.set(value)
elif key == 'Debug': ndebug.set(value) elif key == 'Debug': ndebug.set(value)
elif key == 'HisCall': elif key == 'HisCall':
Audio.gcom2.hiscall=(value+' ')[:12] Audio.gcom2.hiscall=(value+' ')[:12]
@ -2058,7 +2052,6 @@ f.write("NoShJT65 " + str(noshjt65.get()) + "\n")
f.write("Aggressive " + str(naggressive.get()) + "\n") f.write("Aggressive " + str(naggressive.get()) + "\n")
f.write("NEME " + str(neme.get()) + "\n") f.write("NEME " + str(neme.get()) + "\n")
f.write("NDepth " + str(ndepth.get()) + "\n") f.write("NDepth " + str(ndepth.get()) + "\n")
f.write("Accelerate " + str(naccel.get()) + "\n")
f.write("Debug " + str(ndebug.get()) + "\n") f.write("Debug " + str(ndebug.get()) + "\n")
#f.write("TRPeriod " + str(Audio.gcom1.trperiod) + "\n") #f.write("TRPeriod " + str(Audio.gcom1.trperiod) + "\n")
mrudir2=mrudir.replace(" ","#") mrudir2=mrudir.replace(" ","#")