feat: ready for new beta

This commit is contained in:
Prohurtz 2023-09-23 15:05:13 -05:00
parent 73ec950fac
commit ac6f8b98d2
3 changed files with 0 additions and 14 deletions

View File

@ -1,7 +1,6 @@
import json import json
import os.path import os.path
import shutil import shutil
from eye import EyeId from eye import EyeId
from pydantic import BaseModel from pydantic import BaseModel
from typing import Union from typing import Union

View File

@ -34,8 +34,6 @@ from operator import truth
from dataclasses import dataclass from dataclasses import dataclass
import sys import sys
import asyncio import asyncio
sys.path.append(".") sys.path.append(".")
from config import EyeTrackCameraConfig from config import EyeTrackCameraConfig
from config import EyeTrackSettingsConfig from config import EyeTrackSettingsConfig
@ -136,18 +134,14 @@ class EyeProcessor:
self.previous_rotation = self.config.rotation_angle self.previous_rotation = self.config.rotation_angle
self.camera_model = None self.camera_model = None
self.detector_3d = None self.detector_3d = None
self.er_hsf = None self.er_hsf = None
self.er_hsrac = None self.er_hsrac = None
self.er_daddy = None self.er_daddy = None
self.er_leap = None self.er_leap = None
self.ibo = IntensityBasedOpeness(self.eye_id) self.ibo = IntensityBasedOpeness(self.eye_id)
self.roi_include_set = {"rotation_angle", "roi_window_x", "roi_window_y"} self.roi_include_set = {"rotation_angle", "roi_window_x", "roi_window_y"}
self.failed = 0 self.failed = 0
self.skip_blink_detect = False self.skip_blink_detect = False
self.out_y = 0.0 self.out_y = 0.0
self.out_x = 0.0 self.out_x = 0.0
self.rawx = 0.0 self.rawx = 0.0
@ -255,11 +249,9 @@ class EyeProcessor:
def UPDATE(self): def UPDATE(self):
if self.settings.gui_BLINK: if self.settings.gui_BLINK:
self.eyeopen = BLINK(self) self.eyeopen = BLINK(self)
if self.settings.gui_IBO and self.eyeopen != 0.0: #TODO make ransac blink it's pwn self var to rid of this non-sense if self.settings.gui_IBO and self.eyeopen != 0.0: #TODO make ransac blink it's pwn self var to rid of this non-sense
self.eyeopen = self.ibo.intense( self.eyeopen = self.ibo.intense(
self.rawx, self.rawx,

View File

@ -1,17 +1,14 @@
import os import os
import os
import PySimpleGUI as sg import PySimpleGUI as sg
import queue import queue
import requests import requests
import threading import threading
from camera_widget import CameraWidget from camera_widget import CameraWidget
from config import EyeTrackConfig from config import EyeTrackConfig
from eye import EyeId from eye import EyeId
from osc import VRChatOSCReceiver, VRChatOSC from osc import VRChatOSCReceiver, VRChatOSC
from general_settings_widget import SettingsWidget from general_settings_widget import SettingsWidget
from algo_settings_widget import AlgoSettingsWidget from algo_settings_widget import AlgoSettingsWidget
from utils.misc_utils import is_nt, resource_path from utils.misc_utils import is_nt, resource_path
if is_nt: if is_nt:
@ -21,13 +18,11 @@ os.system('color') # init ANSI color
# Random environment variable to speed up webcam opening on the MSMF backend. # Random environment variable to speed up webcam opening on the MSMF backend.
# https://github.com/opencv/opencv/issues/17687 # https://github.com/opencv/opencv/issues/17687
os.environ["OPENCV_VIDEOIO_MSMF_ENABLE_HW_TRANSFORMS"] = "0" os.environ["OPENCV_VIDEOIO_MSMF_ENABLE_HW_TRANSFORMS"] = "0"
WINDOW_NAME = "EyeTrackApp" WINDOW_NAME = "EyeTrackApp"
RIGHT_EYE_NAME = "-RIGHTEYEWIDGET-" RIGHT_EYE_NAME = "-RIGHTEYEWIDGET-"
LEFT_EYE_NAME = "-LEFTEYEWIDGET-" LEFT_EYE_NAME = "-LEFTEYEWIDGET-"
SETTINGS_NAME = "-SETTINGSWIDGET-" SETTINGS_NAME = "-SETTINGSWIDGET-"
ALGO_SETTINGS_NAME = "-ALGOSETTINGSWIDGET-" ALGO_SETTINGS_NAME = "-ALGOSETTINGSWIDGET-"
LEFT_EYE_RADIO_NAME = "-LEFTEYERADIO-" LEFT_EYE_RADIO_NAME = "-LEFTEYERADIO-"
RIGHT_EYE_RADIO_NAME = "-RIGHTEYERADIO-" RIGHT_EYE_RADIO_NAME = "-RIGHTEYERADIO-"
BOTH_EYE_RADIO_NAME = "-BOTHEYERADIO-" BOTH_EYE_RADIO_NAME = "-BOTHEYERADIO-"