From 5b38cdeccdda23ca112009043c61a68a3fafb884 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 29 Dec 2005 21:29:42 +0000 Subject: [PATCH] Tweaked spacings on Astrodata window. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@38 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- astro.py | 20 ++++++++++---------- wsjt.py | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/astro.py b/astro.py index 17fd67091..086876c6c 100644 --- a/astro.py +++ b/astro.py @@ -23,22 +23,22 @@ def astro2(t): def update(): t1= " Az El\n" t2= "Moon: %11.2f %6.2f\n" % (g.AzMoon,g.ElMoon) - t3= "Moon/DX: %6.2f %7.2f\n" % (g.AzMoonB,g.ElMoonB) + t3= "Moon/DX: %6.2f %7.2f\n" % (g.AzMoonB,g.ElMoonB) t4= "Sun: %11.2f %6.2f\n" % (g.AzSun,g.ElSun) - t4a="Source: %8.2f %6.2f\n\n" % (g.AzAux,g.ElAux) - t5= " Doppler df/dt\n" - t6= "DX: %6d %7.2f\n" % (g.ndop,g.dfdt) + t4a="Source: %8.2f %6.2f\n\n" % (g.AzAux,g.ElAux) + t5= " Doppler df/dt\n" + t6= "DX: %6d %7.2f\n" % (g.ndop,g.dfdt) t7= "Self: %8d %7.2f\n\n" % (g.ndop00,g.dfdt0) - t7a=" RA DEC\n" + t7a=" RA DEC\n" irah=int(g.RAMoon) iram=int(60.0*(g.RAMoon-irah)) - t7b="Moon: %2.2d:%2.2d %6.2f\n" % (irah,iram,g.DecMoon) + t7b="Moon: %2.2d:%2.2d %7.2f\n" % (irah,iram,g.DecMoon) irah=int(g.RaAux) iram=int(60.0*(g.RaAux-irah)) - t7c="Source: %2.2d:%2.2d %6.2f\n\n" % (irah,iram,g.DecAux) - t8= "Freq: %4d Tsky:%6d\n" % (g.nfreq,g.ntsky) - t9= "MNR: %4.1f Dgrd:%5.1f\n" % (g.MaxNR,g.Dgrd) - t10="DPol: %4d SD:%7.2f\n" % (g.poloffset,g.sd) + t7c="Source: %2.2d:%2.2d %7.2f\n\n" % (irah,iram,g.DecAux) + t8= "Freq: %4d Tsky: %6d\n" % (g.nfreq,g.ntsky) + t9= "MNR: %4.1f Dgrd: %5.1f\n" % (g.MaxNR,g.Dgrd) + t10="DPol: %4d SD: %7.2f\n" % (g.poloffset,g.sd) t=t1+t2+t3+t4+t4a+t5+t6+t7+t7a+t7b+t7c+t8+t9+t10 lab1.configure(text=t) g.astro_geom=root.geometry() diff --git a/wsjt.py b/wsjt.py index 1872d0db8..70612a489 100644 --- a/wsjt.py +++ b/wsjt.py @@ -1212,9 +1212,9 @@ def update(): graph2.delete(ALL) g2font='Arial 16' graph2.create_text(75,13,anchor=CENTER,text="Moon",font=g2font) - graph2.create_text(26,37,anchor=W, text="Az: %9.2f" % g.AzMoon,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) - graph2.create_text(26,85,anchor=W, text="Dop: %6d" % g.ndop,font=g2font) + graph2.create_text(26,85,anchor=W, text="Dop: %6d" % g.ndop,font=g2font) graph2.create_text(26,109,anchor=W,text="Dgrd:%8.1f" % g.Dgrd,font=g2font) if g.freeze_decode and mode.get()[:4]=='JT65': @@ -2054,7 +2054,7 @@ f.write("Debug " + str(ndebug.get()) + "\n") #f.write("TRPeriod " + str(Audio.gcom1.trperiod) + "\n") mrudir2=mrudir.replace(" ","#") f.write("MRUDir " + mrudir2 + "\n") -if g.astro_geom[:7]=="200x200": g.astro_geom="242x281" + g.astro_geom[7:] +if g.astro_geom[:7]=="200x200": g.astro_geom="268x423" + g.astro_geom[7:] f.write("AstroGeometry " + g.astro_geom + "\n") f.write("CWTRPeriod " + str(ncwtrperiod) + "\n") f.close()