mirror of
https://github.com/EyeTrackVR/EyeTrackVR.git
synced 2025-11-04 14:39:42 +08:00
fix cams, bump ver
This commit is contained in:
parent
3c451b41a8
commit
30077496e3
@ -56,6 +56,7 @@ class Camera:
|
|||||||
self.bps = 0
|
self.bps = 0
|
||||||
self.start = True
|
self.start = True
|
||||||
self.buffer = b''
|
self.buffer = b''
|
||||||
|
self.pf_fps = 0
|
||||||
|
|
||||||
self.error_message = f"{Fore.YELLOW}[WARN] Capture source {{}} not found, retrying...{Fore.RESET}"
|
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
|
self.last_frame_time = current_frame_time
|
||||||
if delta_time > 0:
|
if delta_time > 0:
|
||||||
self.fps = 1 / delta_time
|
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.frame_number = self.frame_number + 1
|
||||||
|
self.fps = (self.fps + self.pf_fps) / 2
|
||||||
|
self.pf_fps = self.fps
|
||||||
#self.bps = image.nbytes
|
#self.bps = image.nbytes
|
||||||
if should_push:
|
if should_push:
|
||||||
self.push_image_to_queue(image, frame_number, self.fps)
|
self.push_image_to_queue(image, frame_number, self.fps)
|
||||||
|
|||||||
@ -33,7 +33,7 @@ SETTINGS_RADIO_NAME = "-SETTINGSRADIO-"
|
|||||||
|
|
||||||
|
|
||||||
page_url = "https://github.com/RedHawk989/EyeTrackVR/releases/latest"
|
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():
|
def main():
|
||||||
|
|||||||
@ -24,7 +24,7 @@ lru_maxsize_vs = 64
|
|||||||
lru_maxsize_s = 128
|
lru_maxsize_s = 128
|
||||||
# CV param
|
# CV param
|
||||||
default_radius = 20
|
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
|
auto_radius_step = 1
|
||||||
blink_init_frames = 60 * 3 # 60fps*3sec,Number of blink statistical frames
|
blink_init_frames = 60 * 3 # 60fps*3sec,Number of blink statistical frames
|
||||||
# step==(x,y)
|
# step==(x,y)
|
||||||
|
|||||||
@ -488,7 +488,7 @@ class HSRAC_cls(object):
|
|||||||
# cv_end_time = timeit.default_timer()
|
# cv_end_time = timeit.default_timer()
|
||||||
# self.timedict["ransac"].append(cv_end_time - ransac_start_time)
|
# self.timedict["ransac"].append(cv_end_time - ransac_start_time)
|
||||||
# self.timedict["total_cv"].append(cv_end_time - cv_start_time)
|
# self.timedict["total_cv"].append(cv_end_time - cv_start_time)
|
||||||
|
print(radius)
|
||||||
try:
|
try:
|
||||||
y, x = ori_frame.shape
|
y, x = ori_frame.shape
|
||||||
th_frame = cv2.resize(th_frame, (x, y))
|
th_frame = cv2.resize(th_frame, (x, y))
|
||||||
|
|||||||
@ -39,8 +39,8 @@ class SettingsWidget:
|
|||||||
self.gui_thresh_add = f"-THRESHADD{widget_id}-"
|
self.gui_thresh_add = f"-THRESHADD{widget_id}-"
|
||||||
self.gui_ROSC = f"-ROSC{widget_id}-"
|
self.gui_ROSC = f"-ROSC{widget_id}-"
|
||||||
self.gui_vrc_native = f"-VRCNATIVE{widget_id}-"
|
self.gui_vrc_native = f"-VRCNATIVE{widget_id}-"
|
||||||
gui_circular_crop_left = f"-CIRCLECROPLEFT{widget_id}-"
|
self.gui_circular_crop_left = f"-CIRCLECROPLEFT{widget_id}-"
|
||||||
gui_circular_crop_right = f"-CIRCLECROPRIGHT{widget_id}-"
|
self.gui_circular_crop_right = f"-CIRCLECROPRIGHT{widget_id}-"
|
||||||
self.gui_update_check = f"-UPDATECHECK{widget_id}-"
|
self.gui_update_check = f"-UPDATECHECK{widget_id}-"
|
||||||
self.gui_threshold_slider = f"-BLOBTHRESHOLD{widget_id}-"
|
self.gui_threshold_slider = f"-BLOBTHRESHOLD{widget_id}-"
|
||||||
self.main_config = main_config
|
self.main_config = main_config
|
||||||
@ -216,7 +216,7 @@ class SettingsWidget:
|
|||||||
sg.Checkbox(
|
sg.Checkbox(
|
||||||
"Left Eye Circle crop",
|
"Left Eye Circle crop",
|
||||||
default=self.config.gui_circular_crop_left,
|
default=self.config.gui_circular_crop_left,
|
||||||
key=self.gui_circular_crop_left ,
|
key=self.gui_circular_crop_left,
|
||||||
background_color='#424042',
|
background_color='#424042',
|
||||||
),
|
),
|
||||||
sg.Checkbox(
|
sg.Checkbox(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user