From 30077496e3b13ee8b04453f3bf4cb3f4f1b8d3de Mon Sep 17 00:00:00 2001 From: Prohurtz <48768484+RedHawk989@users.noreply.github.com> Date: Thu, 11 May 2023 16:00:07 -0500 Subject: [PATCH] fix cams, bump ver --- EyeTrackApp/camera.py | 5 ++++- EyeTrackApp/eyetrackapp.py | 2 +- EyeTrackApp/haar_surround_feature.py | 2 +- EyeTrackApp/hsrac.py | 2 +- EyeTrackApp/settings_widget.py | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/EyeTrackApp/camera.py b/EyeTrackApp/camera.py index c96c965..bf56721 100644 --- a/EyeTrackApp/camera.py +++ b/EyeTrackApp/camera.py @@ -56,6 +56,7 @@ class Camera: self.bps = 0 self.start = True self.buffer = b'' + self.pf_fps = 0 self.error_message = f"{Fore.YELLOW}[WARN] Capture source {{}} not found, retrying...{Fore.RESET}" @@ -134,8 +135,10 @@ class Camera: self.last_frame_time = current_frame_time if delta_time > 0: self.fps = 1 / delta_time - self.bps = len(jpeg) / delta_time + self.bps = len(image) / delta_time self.frame_number = self.frame_number + 1 + self.fps = (self.fps + self.pf_fps) / 2 + self.pf_fps = self.fps #self.bps = image.nbytes if should_push: self.push_image_to_queue(image, frame_number, self.fps) diff --git a/EyeTrackApp/eyetrackapp.py b/EyeTrackApp/eyetrackapp.py index 7e46d5f..9071b9b 100644 --- a/EyeTrackApp/eyetrackapp.py +++ b/EyeTrackApp/eyetrackapp.py @@ -33,7 +33,7 @@ SETTINGS_RADIO_NAME = "-SETTINGSRADIO-" page_url = "https://github.com/RedHawk989/EyeTrackVR/releases/latest" -appversion = "EyeTrackApp 0.2.0 BETA 3" +appversion = "EyeTrackApp 0.2.0 BETA 4" def main(): diff --git a/EyeTrackApp/haar_surround_feature.py b/EyeTrackApp/haar_surround_feature.py index 6d2454c..5abcccf 100644 --- a/EyeTrackApp/haar_surround_feature.py +++ b/EyeTrackApp/haar_surround_feature.py @@ -24,7 +24,7 @@ lru_maxsize_vs = 64 lru_maxsize_s = 128 # CV param default_radius = 20 -auto_radius_range = (default_radius - 10, default_radius + 10) # (10,30) +auto_radius_range = (default_radius - 18, default_radius + 15) # (10,30) auto_radius_step = 1 blink_init_frames = 60 * 3 # 60fps*3sec,Number of blink statistical frames # step==(x,y) diff --git a/EyeTrackApp/hsrac.py b/EyeTrackApp/hsrac.py index 525e362..99a324f 100644 --- a/EyeTrackApp/hsrac.py +++ b/EyeTrackApp/hsrac.py @@ -488,7 +488,7 @@ class HSRAC_cls(object): # cv_end_time = timeit.default_timer() # self.timedict["ransac"].append(cv_end_time - ransac_start_time) # self.timedict["total_cv"].append(cv_end_time - cv_start_time) - + print(radius) try: y, x = ori_frame.shape th_frame = cv2.resize(th_frame, (x, y)) diff --git a/EyeTrackApp/settings_widget.py b/EyeTrackApp/settings_widget.py index b1a7bb6..df953e9 100644 --- a/EyeTrackApp/settings_widget.py +++ b/EyeTrackApp/settings_widget.py @@ -39,8 +39,8 @@ class SettingsWidget: self.gui_thresh_add = f"-THRESHADD{widget_id}-" self.gui_ROSC = f"-ROSC{widget_id}-" self.gui_vrc_native = f"-VRCNATIVE{widget_id}-" - gui_circular_crop_left = f"-CIRCLECROPLEFT{widget_id}-" - gui_circular_crop_right = f"-CIRCLECROPRIGHT{widget_id}-" + self.gui_circular_crop_left = f"-CIRCLECROPLEFT{widget_id}-" + self.gui_circular_crop_right = f"-CIRCLECROPRIGHT{widget_id}-" self.gui_update_check = f"-UPDATECHECK{widget_id}-" self.gui_threshold_slider = f"-BLOBTHRESHOLD{widget_id}-" self.main_config = main_config @@ -216,7 +216,7 @@ class SettingsWidget: sg.Checkbox( "Left Eye Circle crop", default=self.config.gui_circular_crop_left, - key=self.gui_circular_crop_left , + key=self.gui_circular_crop_left, background_color='#424042', ), sg.Checkbox(