w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-26 22:28:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

MOved samfac measurement to Options page.

Browse Source 
Put fQSO into azel.dat.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@457 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2007-07-02 19:55:06 +00:00
parent 0bd3ae43d9
commit 960e7324b5
3 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
astro0.F90
View File

@ -104,11 +104,13 @@ subroutine astro0(nyear,month,nday,uth8,nfreq,grid,cauxra,cauxdec, &
write(14,1010) ih,im,is,AzMoon,ElMoon, & write(14,1010) ih,im,is,AzMoon,ElMoon, &
ih,im,is,AzSun,ElSun, & ih,im,is,AzSun,ElSun, &
ih,im,is,AzAux,ElAux, & ih,im,is,AzAux,ElAux, &
nfreq,doppler,dfdt,doppler00,dfdt0 nfreq,doppler,dfdt,doppler00,dfdt0, &
mousefqso
1010 format(i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Moon'/ & 1010 format(i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Moon'/ &
i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Sun'/ & i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Sun'/ &
i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Source'/ & i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Source'/ &
i4,',',f8.1,',',f8.2,',',f8.1,',',f8.2,',Doppler') i4,',',f8.1,',',f8.2,',',f8.1,',',f8.2,',Doppler'/ &
i4,',fQSO')
rewind 14 rewind 14
isec0=isec isec0=isec
endif endif

42
map65.py
View File

@ -913,9 +913,9 @@ def update():
Audio.gcom2.utcdate=t[:12] Audio.gcom2.utcdate=t[:12]
ldate.configure(text=t) ldate.configure(text=t)
t="Rx noise: %.1f dB" % Audio.gcom2.rxnoise t="Rx noise: %.1f dB" % Audio.gcom2.rxnoise
msg5.configure(text=t) msg4.configure(text=t)
t="Drop: %.1f %%" % Audio.gcom2.pctlost t="Drop: %.1f %%" % Audio.gcom2.pctlost
msg6.configure(text=t) msg5.configure(text=t)
root_geom=root.geometry() root_geom=root.geometry()
try: try:
bm_geom=bm.geometry() bm_geom=bm.geometry()
@ -971,30 +971,18 @@ def update():
i=g.rfnd(t,".") i=g.rfnd(t,".")
t=t[:i] t=t[:i]
if mode.get() != g.mode or first: if mode.get() != g.mode or first:
msg2.configure(bg='#00FFFF') msg1.configure(bg='#00FFFF')
g.mode=mode.get() g.mode=mode.get()
first=0 first=0
samfac_out=Audio.gcom1.mfsample2/110250.0 samfac_out=Audio.gcom1.mfsample2/110250.0
xin=1 t="%6.4f" % (samfac_out)
xout=1 options.meas_rateout.setvalue(t)
try: msg1.configure(text=mode.get())
xout=samfac_out/options.samfacout.get()
if xout<0.999 or xout>1.001:
lab8.configure(text="%6.4f" \
% (options.samfacout.get()), \
fg='black',bg='red')
else:
lab8.configure(fg='gray85',bg='gray85')
except:
pass
msg1.configure(text="%6.4f" % (samfac_out))
msg2.configure(text=mode.get())
t="QSO Freq:%4d" % (int(Audio.gcom2.mousefqso),) t="QSO Freq:%4d" % (int(Audio.gcom2.mousefqso),)
msg3.configure(text=t) msg2.configure(text=t)
t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),) t="QSO DF:%4d" % (int(Audio.gcom2.mousedf),)
msg4.configure(text=t) msg3.configure(text=t)
if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \ if mode.get()[:4]=='JT65' and (Audio.gcom2.ndecoding>0 or \
(isec>45 and Audio.gcom2.monitoring==1 and \ (isec>45 and Audio.gcom2.monitoring==1 and \
@ -1045,7 +1033,7 @@ def update():
else: else:
bgcolor='green' bgcolor='green'
t='Receiving' t='Receiving'
msg7.configure(text=t,bg=bgcolor) msg6.configure(text=t,bg=bgcolor)
if Audio.gcom2.ndecdone>0 or g.cmap != cmap0: if Audio.gcom2.ndecdone>0 or g.cmap != cmap0:
if Audio.gcom2.ndecdone==1: if Audio.gcom2.ndecdone==1:
@ -1556,20 +1544,18 @@ iframe5.pack(expand=1, fill=X, padx=4)
#------------------------------------------------------------ Status Bar #------------------------------------------------------------ Status Bar
iframe6 = Frame(frame, bd=1, relief=SUNKEN) iframe6 = Frame(frame, bd=1, relief=SUNKEN)
msg1=Message(iframe6, text=' ', width=300,relief=SUNKEN) msg1=Message(iframe6, text="Message #2", width=300,relief=SUNKEN)
msg1.pack(side=LEFT, fill=X, padx=1) msg1.pack(side=LEFT, fill=X, padx=1)
msg2=Message(iframe6, text="Message #2", width=300,relief=SUNKEN) msg2=Message(iframe6,width=300,relief=SUNKEN)
msg2.pack(side=LEFT, fill=X, padx=1) msg2.pack(side=LEFT, fill=X, padx=1)
msg3=Message(iframe6,width=300,relief=SUNKEN) msg3=Message(iframe6, text="", width=300,relief=SUNKEN)
msg3.pack(side=LEFT, fill=X, padx=1) msg3.pack(side=LEFT, fill=X, padx=1)
msg4=Message(iframe6, text="", width=300,relief=SUNKEN) msg4=Message(iframe6, text="", width=300,relief=SUNKEN)
msg4.pack(side=LEFT, fill=X, padx=1) msg4.pack(side=LEFT, fill=X, padx=1)
msg5=Message(iframe6, text="", width=300,relief=SUNKEN) msg5=Message(iframe6, text="", width=300,relief=SUNKEN)
msg5.pack(side=LEFT, fill=X, padx=1) msg5.pack(side=LEFT, fill=X, padx=1)
msg6=Message(iframe6, text="", width=300,relief=SUNKEN) msg6=Message(iframe6, text=' ', width=300,relief=SUNKEN)
msg6.pack(side=LEFT, fill=X, padx=1) msg6.pack(side=RIGHT, fill=X, padx=1)
msg7=Message(iframe6, text=' ', width=300,relief=SUNKEN)
msg7.pack(side=RIGHT, fill=X, padx=1)
iframe6.pack(expand=1, fill=X, padx=4) iframe6.pack(expand=1, fill=X, padx=4)
frame.pack() frame.pack()
ldate.after(100,update) ldate.after(100,update)

5
options.py
View File

@ -58,9 +58,10 @@ audioout=Pmw.EntryField(g1.interior(),labelpos=W,label_text='Audio Out:',
value='0',entry_textvariable=DevoutName,entry_width=12) value='0',entry_textvariable=DevoutName,entry_width=12)
rateout=Pmw.EntryField(g1.interior(),labelpos=W,label_text='Rate Out:', rateout=Pmw.EntryField(g1.interior(),labelpos=W,label_text='Rate Out:',
value=1.0000,entry_textvariable=samfacout,entry_width=12) value=1.0000,entry_textvariable=samfacout,entry_width=12)
meas_rateout=Pmw.EntryField(g1.interior(),labelpos=W,label_text='Actual:',
value=1.0000,entry_width=12)
#widgets = (mycall, mygrid, rxdelay,txdelay,idinterval,comport,audioin,audioout) #widgets = (mycall, mygrid, rxdelay,txdelay,idinterval,comport,audioin,audioout)
widgets = (mycall, mygrid,idinterval,comport,audioout,rateout) widgets = (mycall, mygrid,idinterval,comport,audioout,rateout,meas_rateout)
for widget in widgets: for widget in widgets:
widget.pack(fill=X,expand=1,padx=10,pady=2) widget.pack(fill=X,expand=1,padx=10,pady=2)