diff --git a/EyeTrackApp/camera_widget.py b/EyeTrackApp/camera_widget.py index b1f5b8f..f928148 100644 --- a/EyeTrackApp/camera_widget.py +++ b/EyeTrackApp/camera_widget.py @@ -348,19 +348,27 @@ class CameraWidget: self.stop() self.start() - def recenter_eyes(self, osc_message: OSCMessage): - if not isinstance(osc_message.data,bool): - return # just incase we get anything other than bool + def recenter_eyes(self): self.settings.gui_recenter_eyes = True - def recalibrate_eyes(self, osc_message: OSCMessage): - if not isinstance(osc_message.data,bool): + def recalibrate_eyes(self): + self.ransac.calibration_frame_counter = self.settings.calibration_samples + self.ransac.ibo.clear_filter() + PlaySound(resource_path("Audio/start.wav"), SND_FILENAME | SND_ASYNC) + + def osc_recenter_eyes(self, osc_message: OSCMessage): + if not isinstance(osc_message.data, bool): return # just incase we get anything other than bool if osc_message.data: - self.ransac.ibo.clear_filter() - self.ransac.calibration_frame_counter = self.config.calibration_samples - PlaySound("Audio/start.wav", SND_FILENAME | SND_ASYNC) + self.recenter_eyes() + + def osc_recalibrate_eyes(self, osc_message: OSCMessage): + if not isinstance(osc_message.data, bool): + return # just incase we get anything other than bool + + if osc_message.data: + self.recalibrate_eyes() def render(self, window, event, values): changed = False @@ -455,15 +463,13 @@ class CameraWidget: self.hover_pos = None if event == self.gui_restart_calibration: - self.ransac.calibration_frame_counter = self.settings.calibration_samples - self.ransac.ibo.clear_filter() - PlaySound(resource_path("Audio/start.wav"), SND_FILENAME | SND_ASYNC) + self.recalibrate_eyes() if event == self.gui_stop_calibration: self.ransac.calibration_frame_counter = 0 if event == self.gui_recenter_eyes: - self.settings.gui_recenter_eyes = True + self.recenter_eyes() needs_roi_set = self.config.roi_window_h <= 0 or self.config.roi_window_w <= 0 diff --git a/EyeTrackApp/eyetrackapp.py b/EyeTrackApp/eyetrackapp.py index c379c5f..2ad1bc7 100644 --- a/EyeTrackApp/eyetrackapp.py +++ b/EyeTrackApp/eyetrackapp.py @@ -287,15 +287,15 @@ def main(): osc_manager.register_listeners( config.settings.gui_osc_recenter_address, [ - eyes[0].recenter_eyes, - eyes[1].recenter_eyes, + eyes[0].osc_recenter_eyes, + eyes[1].osc_recenter_eyes, ], ) osc_manager.register_listeners( config.settings.gui_osc_recalibrate_address, [ - eyes[0].recalibrate_eyes, - eyes[1].recalibrate_eyes, + eyes[0].osc_recalibrate_eyes, + eyes[1].osc_recalibrate_eyes, ], )