Skip to content

Commit 8a7a477

Browse files
Minor changes
1 parent 36ad4d7 commit 8a7a477

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

GUI/Func_frames.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@ def update_freq_buttons(self, *args):
323323
for btn in self.freq_buttons:
324324
if btn['text'] == f:
325325
btn['relief'] = "sunken"
326-
btn['bg'] = "green yellow"
327-
btn['activebackground'] = "green yellow"
326+
btn['bg'] = "cyan2"
327+
btn['activebackground'] = "cyan2"
328328
else:
329329
btn['relief'] = "raised"
330330
btn['bg'] = "lightblue"
@@ -337,8 +337,8 @@ def update_duty_buttons(self, *args):
337337
for btn in self.duty_buttons:
338338
if btn['text'] == f'{d}%':
339339
btn['relief'] = "sunken"
340-
btn['bg'] = "green yellow"
341-
btn['activebackground'] = "green yellow"
340+
btn['bg'] = "cyan2"
341+
btn['activebackground'] = "cyan2"
342342
else:
343343
btn['relief'] = "raised"
344344
btn['bg'] = "lightblue"
@@ -384,20 +384,20 @@ def __init__(self, root, sts, mcp):
384384
self.edge.trace("w", self.update_edge_buttons)
385385

386386
# Interrupt detector frame
387-
self.status = tk.Label(int_frame, relief="ridge", text="Unknown", bg="yellow2", anchor="center")
388-
self.status.pack(fill=tk.X, ipady=10, pady=10, padx=10)
389-
390-
tk.Button(int_frame,
391-
text="Clear",
387+
self.status = tk.Button(int_frame,
388+
text="Unknown",
392389
command=self.IOC_clear,
393-
padx=5).pack(fill=tk.X, padx=10, pady=2)
390+
bg="yellow2",
391+
anchor="center", height=2)
392+
393+
self.status.pack(fill=tk.X, ipady=10, pady=0, padx=10)
394394

395395
self.int.trace("w", self.update_label)
396396

397397

398398
def update_label(self, *args):
399399
if self.int.get() == "1":
400-
self.status.config(text="FIRED", bg="red2", fg="white")
400+
self.status.config(text="FIRED\n(push to clear)", bg="red2", fg="white")
401401
else:
402402
self.status.config(text="waiting", bg="lightgrey", fg="black")
403403

@@ -426,17 +426,17 @@ def update_edge_buttons(self, *args):
426426

427427
if edge in ("rising", "both"):
428428
self.pos_button['relief'] = "sunken"
429-
self.pos_button['bg'] = "turquoise1"
430-
self.pos_button['activebackground'] = "turquoise1"
429+
self.pos_button['bg'] = "cyan2"
430+
self.pos_button['activebackground'] = "cyan2"
431431
else:
432432
self.pos_button['relief'] = "raised"
433433
self.pos_button['bg'] = "lightblue"
434434
self.pos_button['activebackground'] = "lightblue"
435435

436436
if edge in ("falling", "both"):
437437
self.neg_button['relief'] = "sunken"
438-
self.neg_button['bg'] = "turquoise1"
439-
self.neg_button['activebackground'] = "turquoise1"
438+
self.neg_button['bg'] = "cyan2"
439+
self.neg_button['activebackground'] = "cyan2"
440440
else:
441441
self.neg_button['relief'] = "raised"
442442
self.neg_button['bg'] = "lightblue"

GUI/GP_frame.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self, root, pin, sts, mcp):
4242
cont = ttk.Frame(self)
4343
cont.columnconfigure(0, weight=1)
4444
cont.rowconfigure(0, weight=1)
45-
cont.pack(expand=True, fill=tk.X, anchor=tk.N)
45+
cont.pack(expand=True, fill=tk.BOTH, anchor=tk.N)
4646

4747
self.subframes = {}
4848

0 commit comments

Comments
 (0)