mirror of
https://github.com/EyeTrackVR/EyeTrackVR.git
synced 2025-11-04 14:39:42 +08:00
fix blob and ransac outputs
This commit is contained in:
parent
52297424de
commit
4ce8531136
@ -22,7 +22,7 @@
|
||||
BLOB By: Prohurtz#0001 (Main App Developer)
|
||||
Algorithm App Implimentations By: Prohurtz#0001, qdot (Inital App Creator)
|
||||
|
||||
Copyright (c) 2022 EyeTrackVR <3
|
||||
Copyright (c) 2023 EyeTrackVR <3
|
||||
------------------------------------------------------------------------------------------------------
|
||||
'''
|
||||
|
||||
@ -69,7 +69,7 @@ def BLOB(self):
|
||||
raise RuntimeError("No contours found for image")
|
||||
except:
|
||||
self.failed = self.failed + 1
|
||||
return
|
||||
pass
|
||||
|
||||
rows, cols = larger_threshold.shape
|
||||
|
||||
@ -108,10 +108,6 @@ def BLOB(self):
|
||||
|
||||
#out_x, out_y = cal_osc(self, cx, cy) #filter and calibrate values
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
self.failed = 0
|
||||
return cx, cy, larger_threshold
|
||||
|
||||
@ -26,7 +26,7 @@ Algorithm App Implementations By: Prohurtz#0001, qdot (Initial App Creator)
|
||||
|
||||
Additional Contributors: [Assassin], Summer404NotFound, lorow, ZanzyTHEbar
|
||||
|
||||
Copyright (c) 2022 EyeTrackVR <3
|
||||
Copyright (c) 2023 EyeTrackVR <3
|
||||
------------------------------------------------------------------------------------------------------
|
||||
'''
|
||||
|
||||
@ -318,6 +318,7 @@ class EyeProcessor:
|
||||
self.current_algorithm = InformationOrigin.RANSAC
|
||||
|
||||
def BLOBM(self):
|
||||
print("calling")
|
||||
self.rawx, self.rawy, self.thresh = BLOB(self)
|
||||
self.out_x, self.out_y = cal.cal_osc(self, self.rawx, self.rawy)
|
||||
self.current_algorithm = InformationOrigin.BLOB
|
||||
@ -343,6 +344,10 @@ class EyeProcessor:
|
||||
|
||||
if self.failed == 3 and self.fourthalgo != None:
|
||||
self.fourthalgo()
|
||||
|
||||
if self.failed == 4 and self.fithalgo != None:
|
||||
self.fithalgo()
|
||||
|
||||
else:
|
||||
self.failed = 0 # we have reached last possible algo and it is disabled, move to first algo
|
||||
|
||||
@ -358,7 +363,8 @@ class EyeProcessor:
|
||||
self.secondalgo = None
|
||||
self.thirdalgo = None
|
||||
self.fourthalgo = None
|
||||
algolist = [None, None, None, None, None]
|
||||
self.fithalgo = None
|
||||
algolist = [None, None, None, None, None, None]
|
||||
|
||||
self.er_hsrac = None #clear HSF values when page is opened to correctly reflect setting changes
|
||||
self.er_hsf = None
|
||||
@ -388,25 +394,15 @@ class EyeProcessor:
|
||||
if self.er_daddy is not None:
|
||||
self.er_daddy = None
|
||||
|
||||
_, self.firstalgo, self.secondalgo, self.thirdalgo, self.fourthalgo = algolist
|
||||
if self.settings.gui_RANSAC3D:
|
||||
algolist[self.settings.gui_RANSAC3DP] = self.RANSAC3DM
|
||||
|
||||
if self.settings.gui_BLOB:
|
||||
algolist[self.settings.gui_BLOBP] = self.BLOBM
|
||||
|
||||
_, self.firstalgo, self.secondalgo, self.thirdalgo, self.fourthalgo, self.fithalgo = algolist
|
||||
|
||||
if self.settings.gui_RANSAC3D and self.settings.gui_RANSAC3DP == 1:
|
||||
self.firstalgo = self.RANSAC3DM
|
||||
elif self.settings.gui_RANSAC3D and self.settings.gui_RANSAC3DP == 2:
|
||||
self.secondalgo = self.RANSAC3DM
|
||||
elif self.settings.gui_RANSAC3D and self.settings.gui_RANSAC3DP == 3:
|
||||
self.thirdalgo = self.RANSAC3DM
|
||||
elif self.settings.gui_RANSAC3D and self.settings.gui_RANSAC3DP == 4:
|
||||
self.fourthalgo = self.RANSAC3DM
|
||||
|
||||
if self.settings.gui_BLOB and self.settings.gui_BLOBP == 1:
|
||||
self.firstalgo = self.BLOBM
|
||||
elif self.settings.gui_BLOB and self.settings.gui_BLOBP == 2:
|
||||
self.secondalgo = self.BLOBM
|
||||
elif self.settings.gui_BLOB and self.settings.gui_BLOBP == 3:
|
||||
self.thirdalgo = self.BLOBM
|
||||
elif self.settings.gui_BLOB and self.settings.gui_BLOBP == 4:
|
||||
self.fourthalgo = self.BLOBM
|
||||
|
||||
f = True
|
||||
while True:
|
||||
@ -496,5 +492,6 @@ class EyeProcessor:
|
||||
#self.output_images_and_update(frame, EyeInformation(InformationOrigin.HSF, out_x, out_y, 0, False)) #update app
|
||||
|
||||
self.ALGOSELECT() #run our algos in priority order set in settings
|
||||
#self.BLOBM()
|
||||
self.UPDATE()
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
RANSAC 3D By: Summer#2406 (Main Algorithm Engineer), Pupil Labs (pye3d), PallasNeko (Optimization)
|
||||
Algorithm App Implementations By: Prohurtz#0001, qdot (Initial App Creator)
|
||||
|
||||
Copyright (c) 2022 EyeTrackVR <3
|
||||
Copyright (c) 2023 EyeTrackVR <3
|
||||
------------------------------------------------------------------------------------------------------
|
||||
'''
|
||||
import cv2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user