From 5fdd7421c5963943520115ed41584888b6e76ff2 Mon Sep 17 00:00:00 2001 From: Blabzillaweasel Date: Sun, 16 Feb 2025 09:49:07 +1300 Subject: [PATCH] Hide debug prints, update default config values --- EyeTrackApp/config.py | 12 ++++++------ EyeTrackApp/utils/mirrortrack.py | 19 +++++++++++-------- conftest.py | 8 ++++---- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/EyeTrackApp/config.py b/EyeTrackApp/config.py index e70751d..4bdcb92 100644 --- a/EyeTrackApp/config.py +++ b/EyeTrackApp/config.py @@ -219,14 +219,14 @@ class EyeTrackSettingsConfig(BaseModel): #mirrortrackTracking gui_mirrortrack_enabled: bool = False - gui_mirrortrack_select_right: bool = True - gui_mirrortrack_cycle_count_inv: int = 20 - gui_mirrortrack_cycle_count_stare: int = 10 - gui_mirrortrack_smooth_rate: float = 0.2 - gui_mirrortrack_minthresh: float = 0.3 - gui_mirrortrack_rotation_clamp: float = 0.5 gui_mirrortrack_enable_inv: bool = True gui_mirrortrack_enable_smooth: bool = True + gui_mirrortrack_select_right: bool = True + gui_mirrortrack_cycle_count_inv: int = 15 + gui_mirrortrack_cycle_count_stare: int = 10 + gui_mirrortrack_smooth_rate: float = 0.2 + gui_mirrortrack_minthresh: float = 0.125 + gui_mirrortrack_rotation_clamp: float = 0.3 class EyeTrackConfig(BaseModel): version: int = 1 diff --git a/EyeTrackApp/utils/mirrortrack.py b/EyeTrackApp/utils/mirrortrack.py index f1b689b..0d8e253 100644 --- a/EyeTrackApp/utils/mirrortrack.py +++ b/EyeTrackApp/utils/mirrortrack.py @@ -72,25 +72,25 @@ class MirrorTrack: cls.dom_eye = EyeId.RIGHT if data["gui_mirrortrack_select_right"] else EyeId.LEFT cls.rec_eye = EyeId.LEFT if data["gui_mirrortrack_select_right"] else EyeId.RIGHT cls.is_r_dom = True if data["gui_mirrortrack_select_right"] else False - print(f"Dominant eye changed to {cls.dom_eye.name}") + #print(f"Dominant eye changed to {cls.dom_eye.name}") if "gui_mirrortrack_minthresh" in data: cls.inv_x_thresh = data["gui_mirrortrack_minthresh"] - print(f"MirrorTrack transition threshold changed to {cls.inv_x_thresh}") + #print(f"MirrorTrack transition threshold changed to {cls.inv_x_thresh}") if "gui_mirrortrack_cycle_count_inv" in data: cls.cyc_counts_inv = data["gui_mirrortrack_cycle_count_inv"] cls.cyc_counter_inv.update(cls.cyc_counts_inv) - print(f"MirrorTrack inversion transition condition required cycle count changed to {cls.cyc_counts_inv}") + #print(f"MirrorTrack inversion transition condition required cycle count changed to {cls.cyc_counts_inv}") if "gui_mirrortrack_cycle_count_stare" in data: cls.cyc_counts_stare = data["gui_mirrortrack_cycle_count_stare"] cls.cyc_counter_stare.update(cls.cyc_counts_stare) - print(f"MirrorTrack stare transition condition required cycle count changed to {cls.cyc_counts_stare}") + #print(f"MirrorTrack stare transition condition required cycle count changed to {cls.cyc_counts_stare}") if "gui_mirrortrack_rotation_clamp" in data: cls.inv_clamp = data["gui_mirrortrack_rotation_clamp"] - print(f"MirrorTrack maximum allowed cross-eye changed to {cls.inv_clamp}") + #print(f"MirrorTrack maximum allowed cross-eye changed to {cls.inv_clamp}") if "gui_mirrortrack_enable_inv" in data: cls.is_inv_enabled = data["gui_mirrortrack_enable_inv"] @@ -99,15 +99,15 @@ class MirrorTrack: cls.set_state("STARE") cls.bypass_stare = False - print(f"MirrorTrack allow cross-eye is set to {cls.is_inv_enabled}") + #print(f"MirrorTrack allow cross-eye is set to {cls.is_inv_enabled}") if "gui_mirrortrack_enable_smooth" in data: cls.is_smooth_enabled = data["gui_mirrortrack_enable_smooth"] - print(f"MirrorTrack cross-eye smoothing is set to {cls.is_smooth_enabled}") + #print(f"MirrorTrack cross-eye smoothing is set to {cls.is_smooth_enabled}") if "gui_mirrortrack_smooth_rate" in data: cls.smoothing_rate = data["gui_mirrortrack_smooth_rate"] - print(f"MirrorTrack cross-eye smoothing rate is set to {cls.smoothing_rate}") + #print(f"MirrorTrack cross-eye smoothing rate is set to {cls.smoothing_rate}") #Main processing function @@ -200,6 +200,7 @@ class MirrorTrack: cls.set_state("INVERTED") cls.bypass_stare = True cls.smoothing_trigger = True + #print(f"Smoothing trigger is {cls.smoothing_trigger}") #Begins the counter for deactivation if conditions are not met elif cls.cyc_counter_inv.active(): @@ -210,6 +211,7 @@ class MirrorTrack: cls.bypass_stare = False if cls.is_inverted_mode(): cls.smoothing_trigger = True + #print(f"Smoothing trigger is {cls.smoothing_trigger}") cls.check_for_stare(True) else: return @@ -241,6 +243,7 @@ class MirrorTrack: if abs(out_x - smoothing_out_x) < 0.1: cls.smoothing_trigger = False + #print(f"Smoothing trigger is {cls.smoothing_trigger}") return smoothing_out_x diff --git a/conftest.py b/conftest.py index 7601ce2..e73fd00 100644 --- a/conftest.py +++ b/conftest.py @@ -80,11 +80,11 @@ def eyetrack_settings_config(): gui_mirrortrack_enable_inv=False gui_mirrortrack_enable_smooth=True gui_mirrortrack_select_right=True, - gui_mirrortrack_cycle_count_inv=20, - gui_mirrortrack_cycle_count_stare=20, + gui_mirrortrack_cycle_count_inv=15, + gui_mirrortrack_cycle_count_stare=10, gui_mirrortrack_smooth_rate=0.2, - gui_mirrortrack_minthresh=0.3, - gui_mirrortrack_rotation_clamp=0.5, + gui_mirrortrack_minthresh=0.125, + gui_mirrortrack_rotation_clamp=0.3, )