mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-24 10:22:26 -04:00
Allow fonts for astronomical data to be set from the wsjtrc resource database.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@296 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
4f2358b154
commit
d1c27676fd
6
astro.py
6
astro.py
@ -44,11 +44,7 @@ def update():
|
|||||||
g.astro_geom=root.geometry()
|
g.astro_geom=root.geometry()
|
||||||
frame.after(1000,update)
|
frame.after(1000,update)
|
||||||
|
|
||||||
if g.Win32:
|
g2font=g.g2font
|
||||||
g2font='"Lucida Console" 16'
|
|
||||||
else:
|
|
||||||
g2font='courier 16 bold'
|
|
||||||
|
|
||||||
lab1=Label(frame,font=g2font,justify=LEFT,bg="#66FFFF",
|
lab1=Label(frame,font=g2font,justify=LEFT,bg="#66FFFF",
|
||||||
relief=RIDGE,bd=4,anchor=N)
|
relief=RIDGE,bd=4,anchor=N)
|
||||||
lab1.pack(ipadx=4)
|
lab1.pack(ipadx=4)
|
||||||
|
1
g.py
1
g.py
@ -6,6 +6,7 @@ report="26"
|
|||||||
rms=1.0
|
rms=1.0
|
||||||
mode_change=0
|
mode_change=0
|
||||||
showspecjt=0
|
showspecjt=0
|
||||||
|
g2font='courier 16 bold'
|
||||||
|
|
||||||
#------------------------------------------------------ ftnstr
|
#------------------------------------------------------ ftnstr
|
||||||
def ftnstr(x):
|
def ftnstr(x):
|
||||||
|
6
wsjt.py
6
wsjt.py
@ -1322,10 +1322,6 @@ def update():
|
|||||||
|
|
||||||
if mode.get()[:4]=='JT65' or mode.get()[:2]=='CW' :
|
if mode.get()[:4]=='JT65' or mode.get()[:2]=='CW' :
|
||||||
graph2.delete(ALL)
|
graph2.delete(ALL)
|
||||||
if g.Win32:
|
|
||||||
g2font='"Lucida Console" 16'
|
|
||||||
else:
|
|
||||||
g2font='courier 16 bold'
|
|
||||||
graph2.create_text(80,13,anchor=CENTER,text="Moon",font=g2font)
|
graph2.create_text(80,13,anchor=CENTER,text="Moon",font=g2font)
|
||||||
graph2.create_text(13,37,anchor=W, text="Az: %6.2f" % g.AzMoon,font=g2font)
|
graph2.create_text(13,37,anchor=W, text="Az: %6.2f" % g.AzMoon,font=g2font)
|
||||||
graph2.create_text(13,61,anchor=W, text="El: %6.2f" % g.ElMoon,font=g2font)
|
graph2.create_text(13,61,anchor=W, text="El: %6.2f" % g.ElMoon,font=g2font)
|
||||||
@ -1712,6 +1708,8 @@ Widget.bind(graph1,"<Button-3>",mouse_click_g1)
|
|||||||
graph1.pack(side=LEFT)
|
graph1.pack(side=LEFT)
|
||||||
graph2=Canvas(iframe1, bg='black', width=150, height=120,cursor='crosshair')
|
graph2=Canvas(iframe1, bg='black', width=150, height=120,cursor='crosshair')
|
||||||
graph2.pack(side=LEFT)
|
graph2.pack(side=LEFT)
|
||||||
|
g2font=graph2.option_get("font","font")
|
||||||
|
if g2font!="": g.g2font=g2font
|
||||||
iframe1.pack(expand=1, fill=X, padx=4)
|
iframe1.pack(expand=1, fill=X, padx=4)
|
||||||
|
|
||||||
#------------------------------------------------------ Labels under graphics
|
#------------------------------------------------------ Labels under graphics
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
*font: Arial 8
|
*font: Arial 8
|
||||||
*Label*font: Arial 8
|
*Label*font: Arial 8
|
||||||
*Text*font: "Courier New" 9
|
*Text*font: "Courier New" 9
|
||||||
|
*Canvas*font: "Lucida Console" 16
|
||||||
*background: gray85
|
*background: gray85
|
||||||
*Text*background: white
|
*Text*background: white
|
||||||
*Entry*background: white
|
*Entry*background: white
|
||||||
|
Loading…
x
Reference in New Issue
Block a user