Skip to content

Commit

Permalink
formatting and gui colours
Browse files Browse the repository at this point in the history
  • Loading branch information
@nadje
nadje committed Oct 15, 2024
1 parent c4b66e2 commit b79a834
Show file tree
Hide file tree
Showing 4 changed files with 242 additions and 109 deletions.
217 changes: 149 additions & 68 deletions src/pupil_labs/automate_custom_events/__main__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,37 @@
import sv_ttk
import asyncio
import threading
import sys
import logging
import re
from pupil_labs.automate_custom_events.tk_utils import TTKFormLayoutHelper
from pupil_labs.automate_custom_events.control_modules import run_modules


def extract_ids(url):
# Use regex to extract the workspace ID and recording ID
workspace_pattern = r"workspaces/([a-f0-9\-]+)/"
recording_pattern = r"id=([a-f0-9\-]+)&"

# Find matches using regex
workspace_match = re.search(workspace_pattern, url)
recording_match = re.search(recording_pattern, url)

# Extract the values if they exist
workspace_id = workspace_match.group(1) if workspace_match else None
recording_id = recording_match.group(1) if recording_match else None

return workspace_id, recording_id


# Function to toggle visibility of the general parameters frame
def toggle_general_parameters():
if general_frame.winfo_viewable():
general_frame.grid_remove() # Hide the general parameters frame
else:
general_frame.grid(row=2, column=0, columnspan=2, sticky='ew') # Show the general parameters frame
general_frame.grid(
row=2, column=0, columnspan=2, sticky="ew"
) # Show the general parameters frame


async def run_task():
try:
Expand All @@ -46,11 +50,22 @@ async def run_task():
download_path = Path(download_path_entry.get())
workspace_id, rec_id = extract_ids(url)
recpath = Path(download_path / rec_id)
await run_modules(openai_api_key, workspace_id, rec_id, cloud_token, download_path, recpath,
prompt_description, event_code, batch_size,
start_time_seconds, end_time_seconds)
await run_modules(
openai_api_key,
workspace_id,
rec_id,
cloud_token,
download_path,
recpath,
prompt_description,
event_code,
batch_size,
start_time_seconds,
end_time_seconds,
)
finally:
pass # Removed progress_bar.stop() and run_button.config(state="normal")
pass


def clear_module_fields():
"""Helper function to clear all general parameters and prompt fields."""
Expand All @@ -62,7 +77,7 @@ def clear_module_fields():
prompt_event_entry,
batch_entry,
start_entry,
end_entry
end_entry,
]

for widget in widgets:
Expand All @@ -71,6 +86,7 @@ def clear_module_fields():
else:
widget.delete(0, tk.END)


def on_run_click():
def task():
asyncio.run(run_task())
Expand All @@ -82,6 +98,7 @@ def task():
run_button.config(state="disabled") # Disable run button to prevent multiple clicks
threading.Thread(target=task).start()


# Create the main window
root = tk.Tk()
root.title("Module Controller")
Expand All @@ -100,26 +117,35 @@ def task():
style = ttk.Style()

# Create custom styles
style.configure('Compute.TButton',
background='#6D7BE0', # Desired background color
foreground='white', # Text color
padding=6)

style.map('Compute.TButton',
background=[('active', 'dark blue'), ('pressed', 'navy')],
foreground=[('disabled', 'grey')])

style.layout('Compute.TButton', [('Button.padding', {'children': [('Button.label', {'sticky': 'nswe'})], 'sticky': 'nswe'})])

style.configure('Custom.Horizontal.TProgressbar',
troughcolor='white', # Background area color
background='#6D7BE0') # Optional: sets the border color to match

style.configure('Custom.TEntry',
foreground='white',
fieldbackground='#000000',
background='#000000',
insertcolor='white')
style.configure("Compute.TButton", background="#6D7BE0", foreground="white", padding=6)

style.map(
"Compute.TButton",
background=[("active", "dark blue"), ("pressed", "navy"), ("disabled", "#222222")],
foreground=[("disabled", "#424242")],
)

style.layout(
"Compute.TButton",
[
(
"Button.padding",
{"children": [("Button.label", {"sticky": "nswe"})], "sticky": "nswe"},
)
],
)

style.configure(
"Custom.Horizontal.TProgressbar", troughcolor="white", background="#6D7BE0"
)

style.configure(
"Custom.TEntry",
foreground="white",
fieldbackground="#000000",
background="#000000",
insertcolor="white",
)

heading_font = Font(font=style.lookup("TLabel", "font"))
heading_font.configure(size=heading_font.cget("size"))
Expand All @@ -130,7 +156,7 @@ def task():

# Main frame to center content with consistent margins
main_frame = ttk.Frame(root, padding=(40, 20, 20, 20)) # Added left and right padding
main_frame.grid(column=0, row=0, sticky='nsew')
main_frame.grid(column=0, row=0, sticky="nsew")
root.columnconfigure(0, weight=1)
root.rowconfigure(0, weight=1)

Expand All @@ -139,26 +165,42 @@ def task():
main_frame.columnconfigure(col, weight=1)

# Toggle Button for General Parameters at the top
toggle_button = ttk.Button(main_frame, text="Select Recording", command=toggle_general_parameters)
toggle_button.grid(row=0, column=0, columnspan=2, pady=(10, 10), sticky='ew')
toggle_button = ttk.Button(
main_frame, text="Select Recording", command=toggle_general_parameters
)
toggle_button.grid(row=0, column=0, columnspan=2, pady=(10, 10), sticky="ew")

# General parameters (in a frame)
general_frame = ttk.Frame(main_frame)

# Create labeled entries for the general parameters using the helper functions
bg = '#000000'
entry_fg = 'white'

url_entry = layout_helper.create_labeled_entry(general_frame, 'Recording Link', row=0, default_value='')
cloud_token_entry = layout_helper.create_labeled_entry(general_frame, 'Cloud API Token', row=1, show='*', default_value='')
openai_key_entry = layout_helper.create_labeled_entry(general_frame, 'OpenAI API Key', row=2, show='*', default_value='')
download_path_entry = layout_helper.create_labeled_folder_selector(general_frame, 'Download Path', row=3, default_path=Path.cwd())
batch_entry = layout_helper.create_labeled_entry(general_frame, 'Frame batch', row=4, default_value='30')
start_entry = layout_helper.create_labeled_entry(general_frame, 'Start (s)', row=5, default_value='4')
end_entry = layout_helper.create_labeled_entry(general_frame, 'End (s)', row=6, default_value='45')
bg = "#000000"
entry_fg = "white"

url_entry = layout_helper.create_labeled_entry(
general_frame, "Recording Link", row=0, default_value=""
)
cloud_token_entry = layout_helper.create_labeled_entry(
general_frame, "Cloud API Token", row=1, show="*", default_value=""
)
openai_key_entry = layout_helper.create_labeled_entry(
general_frame, "OpenAI API Key", row=2, show="*", default_value="sk-"
)
download_path_entry = layout_helper.create_labeled_folder_selector(
general_frame, "Download Path", row=3, default_path=Path.cwd()
)
batch_entry = layout_helper.create_labeled_entry(
general_frame, "Frame batch", row=4, default_value=""
)
start_entry = layout_helper.create_labeled_entry(
general_frame, "Start (s)", row=5, default_value=""
)
end_entry = layout_helper.create_labeled_entry(
general_frame, "End (s)", row=6, default_value=""
)

# Initially hide the general parameters section
general_frame.grid(row=2, column=0, columnspan=2, sticky='ew')
general_frame.grid(row=2, column=0, columnspan=2, sticky="ew")
general_frame.grid_remove() # Hide at start

# Layout helper reset for main_frame
Expand All @@ -167,31 +209,66 @@ def task():
# Prompts (always visible)
layout_helper.row_idx = 3 # Start from row 3 to ensure correct placement

layout_helper.add_heading_2('Analyze this egocentric video. The red circle in the overlay indicates where the wearer is looking. Note the times when...', heading_font)
layout_helper.add_heading_2(
"Analyze this egocentric video. The red circle in the overlay indicates where the wearer is looking. Note the times when...",
heading_font,
)
# Insert background for prompt entry
prompt_entry = tk.Text(main_frame, height=5, width=80, bg='#000000', fg='white', insertbackground='white')
layout_helper.add_row('', prompt_entry, {'pady': 10, 'sticky': 'ew'}) # Added sticky='ew' to ensure text fills the width
layout_helper.add_heading('... and report them as the following events.')
prompt_event_entry = tk.Text(main_frame, height=5, width=80, bg='#000000', fg='white', insertbackground='white')
layout_helper.add_row('', prompt_event_entry, {'pady': 10, 'sticky': 'ew'}) # Added sticky='ew' to ensure text fills the width
prompt_entry = tk.Text(
main_frame, height=5, width=80, bg="#000000", fg="white", insertbackground="white"
)
layout_helper.add_row(
"", prompt_entry, {"pady": 10, "sticky": "ew"}
) # Added sticky='ew' to ensure text fills the width
layout_helper.add_heading("... and report them as the following events.")
prompt_event_entry = tk.Text(
main_frame, height=5, width=80, bg="#000000", fg="white", insertbackground="white"
)
layout_helper.add_row(
"", prompt_event_entry, {"pady": 10, "sticky": "ew"}
) # Added sticky='ew' to ensure text fills the width

# Add buttons below the prompt entries
clear_button = ttk.Button(main_frame, text="Reset Form", command=clear_module_fields, style='TButton')
clear_button.grid(row=layout_helper.row_idx, column=0, columnspan=2, pady=(10, 0), sticky='ew')

run_button = ttk.Button(main_frame, text="Compute", command=on_run_click, style='Compute.TButton')
run_button.grid(row=layout_helper.row_idx + 1, column=0, columnspan=2, pady=(10, 10), sticky='ew')
clear_button = ttk.Button(
main_frame, text="Reset Form", command=clear_module_fields, style="TButton"
)
clear_button.grid(
row=layout_helper.row_idx, column=0, columnspan=2, pady=(10, 0), sticky="ew"
)

run_button = ttk.Button(
main_frame, text="Compute", command=on_run_click, style="Compute.TButton"
)
run_button.grid(
row=layout_helper.row_idx + 1, column=0, columnspan=2, pady=(10, 10), sticky="ew"
)

# Progress bar below the buttons
progress_bar = ttk.Progressbar(main_frame, mode='indeterminate', style='Custom.Horizontal.TProgressbar')
progress_bar.grid(row=layout_helper.row_idx + 2, column=0, columnspan=2, pady=(10, 10), sticky='ew')
progress_bar = ttk.Progressbar(
main_frame, mode="indeterminate", style="Custom.Horizontal.TProgressbar"
)
progress_bar.grid(
row=layout_helper.row_idx + 2, column=0, columnspan=2, pady=(10, 10), sticky="ew"
)

# Console output label and text area
console_label = ttk.Label(main_frame, text="Console Output:",style="Heading.TLabel")
console_label.grid(row=layout_helper.row_idx + 3, column=0, columnspan=2, pady=(10, 0), sticky='w')

console_text = tk.Text(main_frame, height=10, width=80, state='disabled', bg='#000000', fg='white', wrap='word')
console_text.grid(row=layout_helper.row_idx + 4, column=0, columnspan=2, pady=(5, 10), sticky='nsew')
console_label = ttk.Label(main_frame, text="Console Output:", style="Heading.TLabel")
console_label.grid(
row=layout_helper.row_idx + 3, column=0, columnspan=2, pady=(10, 0), sticky="w"
)

console_text = tk.Text(
main_frame,
height=10,
width=80,
state="disabled",
bg="#000000",
fg="white",
wrap="word",
)
console_text.grid(
row=layout_helper.row_idx + 4, column=0, columnspan=2, pady=(5, 10), sticky="nsew"
)

# Configure row and column weights for console_text to expand
main_frame.rowconfigure(layout_helper.row_idx + 4, weight=1)
Expand All @@ -203,7 +280,7 @@ def task():
logger.setLevel(logging.DEBUG) # Set the root logger level

# Create formatters
formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")

# Remove any existing handlers
logger.handlers = []
Expand All @@ -213,24 +290,28 @@ def task():
console_handler.setLevel(logging.DEBUG) # Adjust as needed
console_handler.setFormatter(formatter)


# Create GUI handler for the GUI console
class TextHandler(logging.Handler):
def __init__(self, text_widget):
super().__init__()
self.text_widget = text_widget
self.ansi_escape = re.compile(r'\x1B\[[0-?]*[ -/]*[@-~]')
self.ansi_escape = re.compile(r"\x1B\[[0-?]*[ -/]*[@-~]")

def emit(self, record):
msg = self.format(record)
# Clean ANSI escape codes
msg = self.ansi_escape.sub('', msg)
msg = self.ansi_escape.sub("", msg)

def append():
self.text_widget.configure(state='normal')
self.text_widget.insert(tk.END, msg + '\n')
self.text_widget.configure(state="normal")
self.text_widget.insert(tk.END, msg + "\n")
self.text_widget.see(tk.END)
self.text_widget.configure(state='disabled')
self.text_widget.configure(state="disabled")

self.text_widget.after(0, append)


gui_handler = TextHandler(console_text)
gui_handler.setLevel(logging.INFO) # Adjust level as needed
gui_handler.setFormatter(formatter)
Expand Down
Loading

0 comments on commit b79a834

Please sign in to comment.