diff --git a/Makefile.win b/Makefile.win index d650d3760..af5ee08c7 100644 --- a/Makefile.win +++ b/Makefile.win @@ -17,7 +17,8 @@ F2PYONLY = ftn_init ftn_quit audio_init getfile azdist0 astro0 \ SRCS2F90 = a2d.f90 astro0.f90 audio_init.f90 azdist0.f90 \ decode1.f90 ftn_init.f90 ftn_quit.f90 wsjtgen.f90 \ runqqq.f90 fivehz.f90 flushqqq.f90 map65a0.f90 \ - rfile.f90 rfile3a.f90 spec.f90 map65a.f90 + rfile.f90 rfile3a.f90 spec.f90 map65a.f90 display.f90 \ + getfile.f90 getfile2.f90 SRCS2F77 = indexx.f gen65.f chkmsg.f \ gentone.f gencwid.f set.f db.f pctile.f sort.f ssort.f \ @@ -28,7 +29,7 @@ SRCS2F77 = indexx.f gen65.f chkmsg.f \ unpackmsg.f unpacktext.f astro.f azdist.f coord.f dcoord.f \ deg2grid.f dot.f ftsky.f geocentric.f GeoDist.f grid2deg.f \ moon2.f MoonDop.f sun.f toxyz.f pfxdump.f \ - symspec.f ccf65.f trimlist.f display.f chkhist.f decode1a.f \ + symspec.f ccf65.f trimlist.f chkhist.f decode1a.f \ filbig.f fil659.f fil658.f fil6521.f twkfreq.f decode65b.f \ afc65b.f fchisq.f ccf2.f diff --git a/map65.py b/map65.py index f39de1a89..859f8734e 100644 --- a/map65.py +++ b/map65.py @@ -357,6 +357,7 @@ def txstop(event=NONE): if lauto: toggleauto() Audio.gcom1.txok=0 Audio.gcom2.mantx=0 + specjt.pal_gray0() #------------------------------------------------------ lookup def lookup(event=NONE): @@ -1274,7 +1275,7 @@ def update(): if g.cmap != cmap0: im.putpalette(g.palette) cmap0=g.cmap - + # plot_large() # Save some parameters diff --git a/specjt.py b/specjt.py index cecf429fa..987eac09d 100644 --- a/specjt.py +++ b/specjt.py @@ -76,7 +76,6 @@ im2=Image.new('P',(NX,NY)) line02=Image.new('P',(NX,1)) #Image fragment for top line of zoomed waterfall draw2=ImageDraw.Draw(im2) pim2=ImageTk.PhotoImage(im2) - balloon=Pmw.Balloon(root) def pal_gray0(): @@ -246,6 +245,7 @@ def update(): box=(0,0,NX,130-n) #Define region region=im.crop(box) #Get all but last line(s) region2=im2.crop(box) #Get all but last line(s) + box=(125,0,624,120) try: im.paste(region,(0,n)) #Move waterfall down im2.paste(region2,(0,n)) #Move waterfall down @@ -286,7 +286,7 @@ def update(): graph2.delete(ALL) #For some reason, top two lines are invisible, so we move down 2 graph1.create_image(0,0+2,anchor='nw',image=pim) - graph2.create_image(0,0+2,anchor='nw',image=pim2) + graph2.create_image(0,0+2,anchor='nw',image=pim2) g.ndecphase=2 newMinute=0 Audio.gcom2.newspec=0