mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-23 04:38:37 -05:00
Changed version number to 0.8.
Display "No data" if not receiving packets. Permanent label at top of Messages window. Display green tick marks at startup. Fix display of quick-decode time. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@482 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
baa229829d
commit
cbb96ca615
@ -1,5 +1,5 @@
|
|||||||
parameter (NSMAX=60*96000) !Samples per 60 s file
|
parameter (NSMAX=60*96000) !Samples per 60 s file
|
||||||
integer*2 id !46 MB: raw data from Linrad timf2
|
integer*2 id !46 MB: raw data from Linrad timf2
|
||||||
character*80 fname80
|
character*80 fname80
|
||||||
common/datcom/id(4,NSMAX,2),nutc,newdat2,kbuf,kk,kkdone,nlost, &
|
common/datcom/id(4,NSMAX,2),nutc,newdat2,kbuf,kxp,kk,kkdone,nlost, &
|
||||||
nlen,fname80
|
nlen,fname80
|
||||||
|
15
map65.py
15
map65.py
@ -17,7 +17,7 @@ from types import *
|
|||||||
import array
|
import array
|
||||||
|
|
||||||
root = Tk()
|
root = Tk()
|
||||||
Version="0.7 r" + "$Rev$"[6:-1]
|
Version="0.8 r" + "$Rev$"[6:-1]
|
||||||
print "******************************************************************"
|
print "******************************************************************"
|
||||||
print "MAP65 Version " + Version + ", by K1JT"
|
print "MAP65 Version " + Version + ", by K1JT"
|
||||||
print "Revision date: " + \
|
print "Revision date: " + \
|
||||||
@ -61,6 +61,7 @@ hisgrid=""
|
|||||||
isec0=-99
|
isec0=-99
|
||||||
k2txb=IntVar()
|
k2txb=IntVar()
|
||||||
kb8rq=IntVar()
|
kb8rq=IntVar()
|
||||||
|
kxp0=0
|
||||||
loopall=0
|
loopall=0
|
||||||
mode=StringVar()
|
mode=StringVar()
|
||||||
mode.set("")
|
mode.set("")
|
||||||
@ -187,6 +188,8 @@ def messages(event=NONE):
|
|||||||
bm.geometry(bm_geom)
|
bm.geometry(bm_geom)
|
||||||
if g.Win32: bm.iconbitmap("wsjt.ico")
|
if g.Win32: bm.iconbitmap("wsjt.ico")
|
||||||
iframe_bm1 = Frame(bm, bd=1, relief=SUNKEN)
|
iframe_bm1 = Frame(bm, bd=1, relief=SUNKEN)
|
||||||
|
Label(iframe_bm1,text='Freq DF Pol UTC').pack(anchor=W, \
|
||||||
|
pady=0,side='top')
|
||||||
msgtext=Text(iframe_bm1, height=35, width=41, bg="Navy", fg="yellow")
|
msgtext=Text(iframe_bm1, height=35, width=41, bg="Navy", fg="yellow")
|
||||||
msgtext.bind('<Double-Button-1>',dbl_click_msgtext)
|
msgtext.bind('<Double-Button-1>',dbl_click_msgtext)
|
||||||
msgtext.pack(side=LEFT, fill=X, padx=1, pady=3)
|
msgtext.pack(side=LEFT, fill=X, padx=1, pady=3)
|
||||||
@ -922,7 +925,7 @@ def GenAltMsgs(event=NONE):
|
|||||||
|
|
||||||
#------------------------------------------------------ update
|
#------------------------------------------------------ update
|
||||||
def update():
|
def update():
|
||||||
global root_geom,isec0,naz,nel,ndmiles,ndkm,nopen, \
|
global root_geom,isec0,naz,nel,ndmiles,ndkm,nopen,kxp0, \
|
||||||
im,pim,cmap0,isync,isync_save,idsec,first,itol,txsnrdb,tx6alt,\
|
im,pim,cmap0,isync,isync_save,idsec,first,itol,txsnrdb,tx6alt,\
|
||||||
bm_geom,bm2_geom
|
bm_geom,bm2_geom
|
||||||
|
|
||||||
@ -949,6 +952,12 @@ 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()
|
||||||
|
kxp=int(Audio.datcom.kxp)
|
||||||
|
if kxp-kxp0 < 50000:
|
||||||
|
msg5.configure(text='No data',bg='red')
|
||||||
|
else:
|
||||||
|
msg5.configure(bg='gray85')
|
||||||
|
kxp0=kxp
|
||||||
|
|
||||||
if Audio.gcom2.ndecoding==0:
|
if Audio.gcom2.ndecoding==0:
|
||||||
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, \
|
||||||
@ -1105,8 +1114,6 @@ def update():
|
|||||||
lines=""
|
lines=""
|
||||||
msgtext.configure(state=NORMAL)
|
msgtext.configure(state=NORMAL)
|
||||||
msgtext.delete('1.0',END)
|
msgtext.delete('1.0',END)
|
||||||
msgtext.insert(END,'Freq DF Pol UTC\n')
|
|
||||||
msgtext.insert(END,'----------------------------------------\n')
|
|
||||||
for i in range(len(lines)):
|
for i in range(len(lines)):
|
||||||
try:
|
try:
|
||||||
nage=int(lines[i][41:])
|
nage=int(lines[i][41:])
|
||||||
|
14
map65a.F90
14
map65a.F90
@ -254,12 +254,14 @@ subroutine map65a(newdat)
|
|||||||
iloop=iloop+1
|
iloop=iloop+1
|
||||||
go to 1
|
go to 1
|
||||||
endif
|
endif
|
||||||
write(11,*) '$EOF'
|
if(nqd.eq.1) then
|
||||||
call flushqqq(11)
|
write(11,*) '$EOF'
|
||||||
ndecdone=1
|
call flushqqq(11)
|
||||||
t2=sec_midn()
|
ndecdone=1
|
||||||
if(ndebug.eq.2) write(*,3002) mod(int(t2),60)
|
t2=sec_midn()
|
||||||
3002 format('mod65a 2:'i8.2)
|
if(ndebug.eq.2) write(*,3002) mod(int(t2),60)
|
||||||
|
3002 format('mod65a 2:'i8.2)
|
||||||
|
endif
|
||||||
if(nagain.eq.1) go to 999
|
if(nagain.eq.1) go to 999
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
|
@ -76,6 +76,7 @@ subroutine recvpkt(iarg)
|
|||||||
enddo
|
enddo
|
||||||
sqave=sqave + u*(sq-sqave)
|
sqave=sqave + u*(sq-sqave)
|
||||||
rxnoise=10.0*log10(sqave) - 48.0
|
rxnoise=10.0*log10(sqave) - 48.0
|
||||||
|
kxp=k
|
||||||
|
|
||||||
if(mode.eq.'Measur') then
|
if(mode.eq.'Measur') then
|
||||||
npkt=npkt+1
|
npkt=npkt+1
|
||||||
|
Loading…
Reference in New Issue
Block a user