mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-26 22:28:41 -05:00
Cleaned up display of astronomical data with a monospace font.
Remobed unnecessary Windows batch files. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@281 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
0bc2a5976d
commit
f5419c9c5f
30
astro.py
30
astro.py
@ -21,30 +21,30 @@ def astro2(t):
|
||||
root.focus_set()
|
||||
|
||||
def update():
|
||||
t1= " Az El\n"
|
||||
t2= "Moon: %11.2f %6.2f\n" % (g.AzMoon,g.ElMoon)
|
||||
t3= "Moon/DX: %6.2f %7.2f\n" % (g.AzMoonB,g.ElMoonB)
|
||||
t4= "Sun: %11.2f %6.2f\n" % (g.AzSun,g.ElSun)
|
||||
t4a="Source: %8.2f %6.2f\n\n" % (g.AzAux,g.ElAux)
|
||||
t5= " Doppler df/dt\n"
|
||||
t6= "DX: %6d %7.2f\n" % (g.ndop,g.dfdt)
|
||||
t7= "Self: %8d %7.2f\n\n" % (g.ndop00,g.dfdt0)
|
||||
t7a=" RA DEC\n"
|
||||
t1= " Az El\n"
|
||||
t2= "Moon: %6.2f %6.2f\n" % (g.AzMoon,g.ElMoon)
|
||||
t3= "Moon/DX: %6.2f %6.2f\n" % (g.AzMoonB,g.ElMoonB)
|
||||
t4= "Sun: %6.2f %6.2f\n" % (g.AzSun,g.ElSun)
|
||||
t4a="Source: %6.2f %6.2f\n\n" % (g.AzAux,g.ElAux)
|
||||
t5= " Doppler df/dt\n"
|
||||
t6= "DX: %7d %8.2f\n" % (g.ndop,g.dfdt)
|
||||
t7= "Self: %7d %8.2f\n\n" % (g.ndop00,g.dfdt0)
|
||||
t7a=" RA DEC\n"
|
||||
irah=int(g.RAMoon)
|
||||
iram=int(60.0*(g.RAMoon-irah))
|
||||
t7b="Moon: %2.2d:%2.2d %7.2f\n" % (irah,iram,g.DecMoon)
|
||||
t7b="Moon: %2.2d:%2.2d %7.2f\n" % (irah,iram,g.DecMoon)
|
||||
irah=int(g.RaAux)
|
||||
iram=int(60.0*(g.RaAux-irah))
|
||||
t7c="Source: %2.2d:%2.2d %7.2f\n\n" % (irah,iram,g.DecAux)
|
||||
t8= "Freq: %4d Tsky: %6d\n" % (g.nfreq,g.ntsky)
|
||||
t9= "MNR: %4.1f Dgrd: %5.1f\n" % (g.MaxNR,g.Dgrd)
|
||||
t10="DPol: %4d SD: %7.2f\n" % (g.poloffset,g.sd)
|
||||
t7c="Source: %2.2d:%2.2d %7.2f\n\n" % (irah,iram,g.DecAux)
|
||||
t8= "Freq: %4d Tsky: %4d\n" % (g.nfreq,g.ntsky)
|
||||
t9= "MNR: %5.1f Dgrd: %4.1f\n" % (g.MaxNR,g.Dgrd)
|
||||
t10="DPol: %4d SD: %6.2f\n" % (g.poloffset,g.sd)
|
||||
t=t1+t2+t3+t4+t4a+t5+t6+t7+t7a+t7b+t7c+t8+t9+t10
|
||||
lab1.configure(text=t)
|
||||
g.astro_geom=root.geometry()
|
||||
frame.after(1000,update)
|
||||
|
||||
lab1=Label(frame,font=('Helvetica 16'),justify=LEFT,bg="#66FFFF",
|
||||
lab1=Label(frame,font=('"Lucida Console" 16'),justify=LEFT,bg="#66FFFF",
|
||||
relief=RIDGE,bd=4,anchor=N)
|
||||
lab1.pack(ipadx=4)
|
||||
|
||||
|
3
g0.bat
3
g0.bat
@ -1,3 +0,0 @@
|
||||
cl /c /DBIGSYM=1 /Foinit_rs.o init_rs.c
|
||||
cl /c /DBIGSYM=1 /Foencode_rs.o encode_rs.c
|
||||
cl /c /DBIGSYM=1 /Ox /Zd /Fodecode_rs.o decode_rs.c
|
2
g1.bat
2
g1.bat
@ -1,2 +0,0 @@
|
||||
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 -llibsamplerate -m Audio --"fcompiler=compaqv" only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 : a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 blanker.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 i1tor4.f90 pix2d.f90 pix2d65.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 igray.c wrapkarn.c fivehz.f90
|
@ -1 +0,0 @@
|
||||
f2py.py -c --quiet --opt="/traceback /fast" asd1.o -lwinmm -lpa -lfftw3single -m Audio --"fcompiler=compaqv" only: ftn_init audio_init spec getfile azdist0 astro0 : Audio.f90 fsubs1.f xfft.f xffta.f four2a.f fsubs.f astropak.f jtaudio.c ptt.c fivehz.f90 -lfftw3single
|
1
g2.bat
1
g2.bat
@ -1 +0,0 @@
|
||||
c:\python23\installer\makespec.py --icon wsjt.ico --tk --onefile wsjt.py
|
6
go.bat
6
go.bat
@ -1,6 +0,0 @@
|
||||
cl /c /DBIGSYM=1 /Foinit_rs.obj init_rs.c
|
||||
cl /c /DBIGSYM=1 /Foencode_rs.obj encode_rs.c
|
||||
cl /c /DBIGSYM=1 /Ox /Zd /Fodecode_rs.obj decode_rs.c
|
||||
cl /c /DWin32=1 wrapkarn.c
|
||||
cl /c /DWin32=1 igray.c
|
||||
df /exe:JT65code.exe JT65code_all.f /link wrapkarn.obj init_rs.obj encode_rs.obj decode_rs.obj igray.obj
|
12
wsjt.py
12
wsjt.py
@ -1299,12 +1299,12 @@ def update():
|
||||
|
||||
if mode.get()[:4]=='JT65' or mode.get()[:2]=='CW' :
|
||||
graph2.delete(ALL)
|
||||
g2font='Helvetica 16'
|
||||
graph2.create_text(75,13,anchor=CENTER,text="Moon",font=g2font)
|
||||
graph2.create_text(26,37,anchor=W, text="Az: %8.2f" % g.AzMoon,font=g2font)
|
||||
graph2.create_text(26,61,anchor=W, text="El: %8.2f" % g.ElMoon,font=g2font)
|
||||
graph2.create_text(26,85,anchor=W, text="Dop: %6d" % g.ndop,font=g2font)
|
||||
graph2.create_text(26,109,anchor=W,text="Dgrd:%8.1f" % g.Dgrd,font=g2font)
|
||||
g2font='"Lucida Console" 16'
|
||||
graph2.create_text(80,13,anchor=CENTER,text="Moon",font=g2font)
|
||||
graph2.create_text(13,37,anchor=W, text="Az: %6.2f" % g.AzMoon,font=g2font)
|
||||
graph2.create_text(13,61,anchor=W, text="El: %6.2f" % g.ElMoon,font=g2font)
|
||||
graph2.create_text(13,85,anchor=W, text="Dop:%6d" % g.ndop,font=g2font)
|
||||
graph2.create_text(13,109,anchor=W,text="Dgrd:%5.1f" % g.Dgrd,font=g2font)
|
||||
|
||||
if g.freeze_decode and mode.get()[:4]=='JT65':
|
||||
itol=2
|
||||
|
Loading…
Reference in New Issue
Block a user