diff --git a/CALL3.TXT b/CALL3.TXT index 4ac774508..131e39ff4 100644 --- a/CALL3.TXT +++ b/CALL3.TXT @@ -4038,6 +4038,7 @@ VK3ZYC,QF31NT,EME,,,,144: 2x 10el 4wl Yagis 300W,03/05 VK4ABW,QH30GT,EME,,,,144: 4x 17el 300W,01/06 VK4AFL,QG62OJ,EME,,,,432: 16x 15el 100W,09/05 VK4CDI,QG52XH,EME,,,,144: 170W 2x 12El Yagi - 432: 100W 22El Yag,09/05 +VK4JMC,QG62,EME,, VK4JSR,QG62NM,,,,,50: 100W 8el - 144: 400W 12el - 432: 100W 28e,10/00 VK4KAZ,QG63KQ,EME,,,,,2003 VK4WS,QG62OK,EME,,,,144: 12el QRP,12/05 diff --git a/map65.py b/map65.py index e1a8a004c..4db968cc5 100644 --- a/map65.py +++ b/map65.py @@ -98,6 +98,9 @@ g.ndevin=IntVar() g.ndevout=IntVar() g.DevinName=StringVar() g.DevoutName=StringVar() + +g.fc=["" for i in range(200)] + #------------------------------------------------------ showspecjt def showspecjt(event=NONE): if g.showspecjt==0: g.showspecjt=1 @@ -1133,9 +1136,21 @@ def update(): if nage==1: attr='age1' if nage==2: attr='age2' if nage>=3: attr='age3' -# print i,j,t bmtext.insert(END,t,attr) + t=t[:12] + if t!=" ": + try: + k=int(t[:3]) + c=t[4:10] + if c!=NONE: + t=g.fc[k] + if t.find(c+" ") == -1: + g.fc[k]=g.fc[k] + c + " " + except: + pass bmtext.see(END) +# for i in range(100,160): +# if g.fc[i]!="": print i,g.fc[i] Audio.gcom2.ndecdone=0 if loopall: opennext() diff --git a/specjt.py b/specjt.py index 48755e790..216024325 100644 --- a/specjt.py +++ b/specjt.py @@ -113,13 +113,17 @@ def fdf_change(event): df=96.0/750.0 fmid=122.8 # empirical g.Freq=df*(event.x-375) + fmid - t="Freq: %5.1f kHz" % (g.Freq,) + n=int(g.Freq) + t="%d" % (n,) + if g.fc[n] != "": + t=t + ": " + g.fc[n] fdf.configure(text=t) def fdf_change2(event): - g.DFreq=(2200.0/750.0)*(event.x-375) - t="DF: %d Hz" % int(g.DFreq) - fdf2.configure(text=t) + pass +## g.DFreq=(2200.0/750.0)*(event.x-375) +## t="DF: %d Hz" % int(g.DFreq) +## fdf2.configure(text=t) #---------------------------------------------------- set_fqso def set_fqso(event): @@ -378,7 +382,7 @@ setupmenu.add_radiobutton(label='AFMHot',command=pal_AFMHot, lab1=Label(mbar,padx=20,bd=0) lab1.pack(side=LEFT) -fdf=Label(mbar,width=15,bd=0) +fdf=Label(mbar,width=30,bd=0) fdf.pack(side=LEFT) fdf2=Label(mbar,width=15,bd=0) fdf2.pack(side=LEFT)