diff --git a/g1 b/g1 index 83c22c959..c7dbc86d1 100755 --- a/g1 +++ b/g1 @@ -1,3 +1 @@ -g95 -cpp -DLinux -fno-second-underscore -o makedate makedate.f90 -makedate -python f2py.py -c --quiet --opt="-O -cpp -DLinux -fno-second-underscore" init_rs.o encode_rs.o decode_rs.o -m Audio --"f77exec=/home/joe/bin/g95" --f90exec="/home/joe/bin/g95" -L//usr/lib/gcc-lib/i386-redhat-linux/3.2.2/ -lpthread -lg2c 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 jtaudio.c ptt_linux.c wrapkarn.c start_threads.c cutil.c fivehz.f90 +python f2py.py -c --quiet --opt="-O -cpp -DLinux -fno-second-underscore" init_rs.o encode_rs.o decode_rs.o -m Audio --"f77exec=/home/joe/bin/g95" --f90exec="/home/joe/bin/g95" -L//usr/lib/gcc-lib/i386-redhat-linux/3.2.2/ -lpthread -lg2c only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 : 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 jtaudio.c ptt_linux.c wrapkarn.c start_threads.c cutil.c fivehz.f90 diff --git a/g1.bat b/g1.bat index cdb341ec7..dd75846bf 100644 --- a/g1.bat +++ b/g1.bat @@ -1,4 +1,2 @@ -df /fpp /define:Win32 makedate.f90 -makedate 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 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 : 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 diff --git a/wsjt.py b/wsjt.py index 5928bf4ee..7233c31e3 100644 --- a/wsjt.py +++ b/wsjt.py @@ -13,12 +13,11 @@ from palettes import colormapblue, colormapgray0, colormapHot, \ colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette root = Tk() -Version="5.9.2 $Rev$" +Version="5.9.2 r" + "$Rev$"[6:-1] print "******************************************************************" print "WSJT Version " + Version + ", by K1JT" -isec=Audio.makedate_sub() -print "Build date: " + time.asctime(time.gmtime(isec)) + " UTC" -print "$Date$" +print "Revision date: " + \ + "$Date$"[7:-1] print "Run date: " + time.asctime(time.gmtime()) + " UTC" try: root.option_readfile('wsjtrc') @@ -612,7 +611,7 @@ def about(event=NONE): about.geometry(msgpos()) if g.Win32: about.iconbitmap("wsjt.ico") t="WSJT Version " + Version + ", by K1JT" - Label(about,text=t,font=(font1,18)).pack(padx=20,pady=5) + Label(about,text=t,font=(font1,16)).pack(padx=20,pady=5) t=""" WSJT is a weak signal communications program. It supports five operating modes: FSK441, a fast mode for meteor scatter; @@ -621,16 +620,14 @@ on 50 MHz; JT65, an extremely sensitive mode for troposcatter and EME; CW at 15 WPM with messages structured for EME; and an EME Echo mode for measuring your own echoes from the moon. """ - Label(about,text=t,font=(font1,10),justify=LEFT).pack(padx=20) + Label(about,text=t,font=(font1,9),justify=LEFT).pack(padx=20) t=""" Copyright(C) 2001-2005 by Joseph H. Taylor, Jr., K1JT. """ Label(about,text=t,font=(font1,9),justify=LEFT).pack(padx=20) - - isec=Audio.makedate_sub() - t="Build date: " + time.asctime(time.gmtime(isec)) + " UTC" + t="Revision date: " + \ + "$Date$"[7:-1] Label(about,text=t,font=(font1,9)).pack(padx=20) - about.focus_set() #------------------------------------------------------ shortcuts