diff --git a/astro.py b/astro.py index 086876c6c..f92fcb8fd 100644 --- a/astro.py +++ b/astro.py @@ -44,7 +44,7 @@ def update(): g.astro_geom=root.geometry() frame.after(1000,update) -lab1=Label(frame,font=('Arial 16'),justify=LEFT,bg="#66FFFF", +lab1=Label(frame,font=('Helvetica 16'),justify=LEFT,bg="#66FFFF", relief=RIDGE,bd=4,anchor=N) lab1.pack(ipadx=4) diff --git a/indexx.f b/indexx.f index 464979742..df2a5330e 100644 --- a/indexx.f +++ b/indexx.f @@ -1,6 +1,6 @@ subroutine indexx(n,arr,indx) - parameter (NMAX=2000) + parameter (NMAX=3000) integer indx(n) real arr(n) real brr(NMAX) diff --git a/jtaudio.c b/jtaudio.c index cd40513f0..741ac1b8d 100644 --- a/jtaudio.c +++ b/jtaudio.c @@ -146,7 +146,6 @@ static int SoundOut( void *inputBuffer, void *outputBuffer, // ic = framesPerBuffer*ic; ic = (int)(stime - *data->trperiod*n) * data->nfs; ic = ic % *data->nwave; - // printf("%d\n",ic); } TxOKz=*data->TxOK; @@ -224,7 +223,7 @@ int jtaudio_(int *ndevin, int *ndevout, short y1[], short y2[], inputParameters.device=*ndevin; inputParameters.channelCount=2; inputParameters.sampleFormat=paInt16; - inputParameters.suggestedLatency=0.5; + inputParameters.suggestedLatency=1.0; inputParameters.hostApiSpecificStreamInfo=NULL; err2=Pa_OpenStream( &instream, //address of stream @@ -244,7 +243,7 @@ int jtaudio_(int *ndevin, int *ndevout, short y1[], short y2[], outputParameters.device=*ndevout; outputParameters.channelCount=2; outputParameters.sampleFormat=paInt16; - outputParameters.suggestedLatency=0.5; + outputParameters.suggestedLatency=1.0; outputParameters.hostApiSpecificStreamInfo=NULL; err2a=Pa_OpenStream( &outstream, //address of stream diff --git a/specjt.py b/specjt.py index 5a14c49ed..c2bd63b45 100644 --- a/specjt.py +++ b/specjt.py @@ -414,7 +414,7 @@ sc2.pack(side=LEFT) balloon.bind(sc1,"Brightness", "Brightness") balloon.bind(sc2,"Contrast", "Contrast") balloon.configure(statuscommand=status.helpmessage) -ltime=Label(iframe2,bg='black',fg='yellow',width=8,bd=2,font=('Arial',16)) +ltime=Label(iframe2,bg='black',fg='yellow',width=8,bd=2,font=('Helvetica',16)) ltime.pack(side=LEFT) msg1=Label(iframe2,padx=2,bd=2,text=" ") msg1.pack(side=LEFT) diff --git a/wsjt.py b/wsjt.py index fb3c16301..7409f6ca9 100644 --- a/wsjt.py +++ b/wsjt.py @@ -48,7 +48,6 @@ font1='Helvetica' font2='Helvetica' #font1=('MS', 'Sans', 'Serif') #font2=('MS', 'Sans', 'Serif') -font3='Courier' hiscall="" hisgrid="" isec0=-99 @@ -478,7 +477,7 @@ def ModeFSK441(event=NONE): mode.set("FSK441") cleartext() Audio.gcom1.trperiod=30 - lab2.configure(text='FileID T Width dB Rpt DF') + lab2.configure(text='FileID T Width dB Rpt DF') lab1.configure(text='Time (s)',bg="green") lab4.configure(fg='black') lab5.configure(fg='black') @@ -507,7 +506,7 @@ def ModeFSK441(event=NONE): def ModeJT65(): global slabel,isync,isync65,textheight,itol cleartext() - lab2.configure(text='FileID Sync dB DT DF W') + lab2.configure(text='FileID Sync dB DT DF W') lab4.configure(fg='gray85') lab5.configure(fg='gray85') Audio.gcom1.trperiod=60 @@ -560,7 +559,7 @@ def ModeJT6M(event=NONE): if lauto: toggleauto() cleartext() ModeFSK441() - lab2.configure(text='FileID T Width dB DF') + lab2.configure(text='FileID T Width dB DF') mode.set("JT6M") isync=isync6m lsync.configure(text=slabel+str(isync)) @@ -1209,7 +1208,7 @@ def update(): if mode.get()[:4]=='JT65' or mode.get()[:2]=='CW' : graph2.delete(ALL) - g2font='Arial 16' + 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) @@ -1584,7 +1583,7 @@ iframe2.pack(expand=1, fill=X, padx=4) #-------------------------------------------------------- Decoded text iframe4 = Frame(frame, bd=1, relief=SUNKEN) -text=Text(iframe4, height=6, width =90, font=(font3,9)) +text=Text(iframe4, height=6, width=80) text.bind('',dbl_click_text) text.bind('',dbl_click_text) @@ -1649,7 +1648,7 @@ sb.pack(side=RIGHT, fill=Y) text.configure(yscrollcommand=sb.set) iframe4.pack(expand=1, fill=X, padx=4) iframe4b = Frame(frame, bd=1, relief=SUNKEN) -avetext=Text(iframe4b, height=2, width =90, font=(font3,9)) +avetext=Text(iframe4b, height=2, width=80) #avetext.bind('', lambda e: "break") avetext.bind('',dbl_click_ave) avetext.bind('',dbl_click_ave) @@ -1790,43 +1789,43 @@ auto.grid(column=0,row=5,sticky='EW',padx=4) #txstop.grid(column=0,row=6,sticky='EW',padx=4) ntx=IntVar() -tx1=Entry(f5c,width=28, font=(font2,9)) +tx1=Entry(f5c,width=22, font=(font2,9)) rb1=Radiobutton(f5c,value=1,variable=ntx) b1=Button(f5c, text='Tx1',underline=2,command=btx1,padx=1,pady=1) tx1.grid(column=1,row=0) 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)) +tx2=Entry(f5c,width=22, font=(font2,9)) +#tx2=Entry(f5c,width=22, 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) rb2.grid(column=2,row=1) b2.grid(column=3,row=1) -tx3=Entry(f5c,width=28, font=(font2,9)) +tx3=Entry(f5c,width=22, font=(font2,9)) rb3=Radiobutton(f5c,value=3,variable=ntx) b3=Button(f5c, text='Tx3',underline=2,command=btx3,padx=1,pady=1) tx3.grid(column=1,row=2) rb3.grid(column=2,row=2) b3.grid(column=3,row=2) -tx4=Entry(f5c,width=28, font=(font2,9)) +tx4=Entry(f5c,width=22, font=(font2,9)) rb4=Radiobutton(f5c,value=4,variable=ntx) b4=Button(f5c, text='Tx4',underline=2,command=btx4,padx=1,pady=1) tx4.grid(column=1,row=3) rb4.grid(column=2,row=3) b4.grid(column=3,row=3) -tx5=Entry(f5c,width=28, font=(font2,9)) +tx5=Entry(f5c,width=22, font=(font2,9)) rb5=Radiobutton(f5c,value=5,variable=ntx) b5=Button(f5c, text='Tx5',underline=2,command=btx5,padx=1,pady=1) tx5.grid(column=1,row=4) rb5.grid(column=2,row=4) b5.grid(column=3,row=4) -tx6=Entry(f5c,width=28, font=(font2,9)) +tx6=Entry(f5c,width=22, font=(font2,9)) rb6=Radiobutton(f5c,value=6,variable=ntx) b6=Button(f5c, text='Tx6',underline=2,command=btx6,padx=1,pady=1) tx6.grid(column=1,row=5) diff --git a/wsjtrc b/wsjtrc index 8122164ce..878089ec8 100644 --- a/wsjtrc +++ b/wsjtrc @@ -1,7 +1,8 @@ -*font: Arial 8 -*Label*font: Arial 8 +*font: Arial 9 +*Label*font: Arial 9 +*Text*font: "Courier New" 10 *background: gray85 *Text*background: white *Entry*background: white -*foregouund: black +*foreground: black *Listbox*foreground: RoyalBlue