diff --git a/g1 b/g1 index 56602fa1e..83c22c959 100755 --- a/g1 +++ b/g1 @@ -1,4 +1,3 @@ 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 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 diff --git a/wsjt.py b/wsjt.py index 081c44b6f..3ceaf8fd2 100644 --- a/wsjt.py +++ b/wsjt.py @@ -13,7 +13,7 @@ from palettes import colormapblue, colormapgray0, colormapHot, \ colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette root = Tk() -Version="5.9.2 r14" +Version="5.9.2 r16" print "******************************************************************" print "WSJT Version " + Version + ", by K1JT" isec=Audio.makedate_sub() @@ -45,7 +45,7 @@ lauto=0 cmap0="Linrad" fileopened="" font1='Helvetica' -font2='Helcetica' +font2='Helvetica' #font1=('MS', 'Sans', 'Serif') #font2=('MS', 'Sans', 'Serif') font3='Courier' @@ -1702,14 +1702,14 @@ iframe5 = Frame(frame, bd=1, relief=FLAT,height=180) f5a=Frame(iframe5,height=170,bd=2,relief=GROOVE) labToRadio=Label(f5a,text='To radio:', width=9, relief=FLAT) labToRadio.grid(column=0,row=0) -ToRadio=Entry(f5a,width=9,font=(font2,10)) +ToRadio=Entry(f5a,width=9,font=(font2,9)) ToRadio.insert(0,'W8WN') ToRadio.grid(column=1,row=0,pady=3) bLookup=Button(f5a, text='Lookup',underline=0,command=lookup,padx=1,pady=1) bLookup.grid(column=2,row=0,sticky='EW',padx=4) labGrid=Label(f5a,text='Grid:', width=9, relief=FLAT) labGrid.grid(column=0,row=1) -HisGrid=Entry(f5a,width=9,font=(font2,10)) +HisGrid=Entry(f5a,width=9,font=(font2,9)) HisGrid.grid(column=1,row=1,pady=1) bAdd=Button(f5a, text='Add',command=addtodb,padx=1,pady=1) bAdd.grid(column=2,row=1,sticky='EW',padx=4) @@ -1800,6 +1800,7 @@ rb1.grid(column=2,row=0) b1.grid(column=3,row=0) tx2=Entry(f5c,width=28, font=(font2,9)) +#tx2=Entry(f5c,width=28, font=('helvetica',9)) rb2=Radiobutton(f5c,value=2,variable=ntx) b2=Button(f5c, text='Tx2',underline=2,command=btx2,padx=1,pady=1) tx2.grid(column=1,row=1)