From 22e9c6df859e5d474e8e4ab930049590127cbcc4 Mon Sep 17 00:00:00 2001 From: Prohurtz <48768484+RedHawk989@users.noreply.github.com> Date: Thu, 11 May 2023 09:04:30 -0700 Subject: [PATCH] cleanup, update credits, rename --- EyeTrackApp/daddy.py | 27 +++++++++++++++++++ EyeTrackApp/eye_processor.py | 4 +-- ...ye_open.py => intensity_based_openness.py} | 26 ++++++++++++++++++ EyeTrackApp/ransac.py | 16 +++-------- 4 files changed, 59 insertions(+), 14 deletions(-) rename EyeTrackApp/{intensity_eye_open.py => intensity_based_openness.py} (84%) diff --git a/EyeTrackApp/daddy.py b/EyeTrackApp/daddy.py index 91a164b..c461d14 100644 --- a/EyeTrackApp/daddy.py +++ b/EyeTrackApp/daddy.py @@ -1,3 +1,30 @@ +''' +------------------------------------------------------------------------------------------------------ + + ,@@@@@@ + @@@@@@@@@@@ @@@ + @@@@@@@@@@@@ @@@@@@@@@@@ + @@@@@@@@@@@@@ @@@@@@@@@@@@@@ + @@@@@@@/ ,@@@@@@@@@@@@@ + /@@@@@@@@@@@@@@@ @@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@ @@@@@ + @@@@@@@@ @@@@@ + ,@@@ @@@@& + @@@@@@. @@@@ + @@@ @@@@@@@@@/ @@@@@ + ,@@@. @@@@@@((@ @@@@( + //@@@ ,, @@@@ @@@@@ + @@@( @@@@@@@ + @@@ @ @@@@@@@@# + @@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@( + +DADDY By: PallasNeko Optimization +Algorithm App Implementations By: PallasNeko, Prohurtz + +Copyright (c) 2023 EyeTrackVR <3 +------------------------------------------------------------------------------------------------------ +''' import sys from typing import Tuple import math diff --git a/EyeTrackApp/eye_processor.py b/EyeTrackApp/eye_processor.py index 939639a..979c2ba 100644 --- a/EyeTrackApp/eye_processor.py +++ b/EyeTrackApp/eye_processor.py @@ -22,7 +22,7 @@ HSR By: PallasNeko (Optimization Wizard, Contributor), Summer#2406 (Main Algorithm Engineer) RANSAC 3D By: Summer#2406 (Main Algorithm Engineer), Pupil Labs (pye3d), PallasNeko (Optimization) BLOB By: Prohurtz#0001 (Main App Developer) -Algorithm App Implementations By: Prohurtz#0001, qdot (Initial App Creator) +Algorithm App Implementations By: Prohurtz, qdot (Initial App Creator) Additional Contributors: [Assassin], Summer404NotFound, lorow, ZanzyTHEbar @@ -60,7 +60,7 @@ from hsrac import External_Run_HSRACS from blink import * from eye import EyeInfo, EyeInfoOrigin -from intensity_eye_open import * +from intensity_based_openness import * def run_once(f): diff --git a/EyeTrackApp/intensity_eye_open.py b/EyeTrackApp/intensity_based_openness.py similarity index 84% rename from EyeTrackApp/intensity_eye_open.py rename to EyeTrackApp/intensity_based_openness.py index 2b2ded5..9696ad3 100644 --- a/EyeTrackApp/intensity_eye_open.py +++ b/EyeTrackApp/intensity_based_openness.py @@ -1,3 +1,29 @@ +''' +------------------------------------------------------------------------------------------------------ + + ,@@@@@@ + @@@@@@@@@@@ @@@ + @@@@@@@@@@@@ @@@@@@@@@@@ + @@@@@@@@@@@@@ @@@@@@@@@@@@@@ + @@@@@@@/ ,@@@@@@@@@@@@@ + /@@@@@@@@@@@@@@@ @@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@ @@@@@ + @@@@@@@@ @@@@@ + ,@@@ @@@@& + @@@@@@. @@@@ + @@@ @@@@@@@@@/ @@@@@ + ,@@@. @@@@@@((@ @@@@( + //@@@ ,, @@@@ @@@@@ + @@@( @@@@@@@ + @@@ @ @@@@@@@@# + @@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@( +Intensity Based Openess By: Prohurtz, PallasNeko (Optimization) +Algorithm App Implementations By: Prohurtzs + +Copyright (c) 2023 EyeTrackVR <3 +------------------------------------------------------------------------------------------------------ +''' import numpy as np import time import os diff --git a/EyeTrackApp/ransac.py b/EyeTrackApp/ransac.py index 9bfb257..3268f8d 100644 --- a/EyeTrackApp/ransac.py +++ b/EyeTrackApp/ransac.py @@ -20,7 +20,7 @@ @@@@@@@@@@@@@( RANSAC 3D By: Summer#2406 (Main Algorithm Engineer), Pupil Labs (pye3d), PallasNeko (Optimization) -Algorithm App Implementations By: Prohurtz#0001, qdot (Initial App Creator) +Algorithm App Implementations By: Prohurtz, qdot (Initial App Creator) Copyright (c) 2023 EyeTrackVR <3 ------------------------------------------------------------------------------------------------------ @@ -191,9 +191,8 @@ def RANSAC3D(self): frame = self.current_image_gray # For measuring processing time of image processing # Crop first to reduce the amount of data to process. - # frame = frame[0:len(frame) - 5, :] - # To reduce the processing data, first convert to 1-channel and then blur. - # The processing results were the same when I swapped the order of blurring and 1-channelization. + # frame = frame[0:len(frame) - 5, :] + # To reduce the processing data, blur. frame_gray = cv2.GaussianBlur(frame, (5, 5), 0) @@ -264,9 +263,7 @@ def RANSAC3D(self): # via dicts). result_2d = {} result_2d_final = {} - result_2d["center"] = (cx, cy) - result_2d["axes"] = (w, h) result_2d["angle"] = theta * 180.0 / np.pi result_2d_final["ellipse"] = result_2d @@ -344,9 +341,4 @@ def RANSAC3D(self): return cx, cy, thresh except: self.failed = self.failed + 1 #we have failed, move onto next algo - return 0, 0, thresh - # Shove a concatenated image out to the main GUI thread for rendering - #self.output_images_and_update(thresh, EyeInfo(EyeInfoOrigin.FAILURE, 0 ,0, 0, False)) - #self.output_images_and_update(thresh, output_info) - #except: - # self.output_images_and_update(thresh, EyeInfo(EyeInfoOrigin.RANSAC, out_x, out_y, 0, self.blinkvalue)) + return 0, 0, thresh \ No newline at end of file