fix: HSF algo order number

This commit is contained in:
Prohurtz 2024-02-08 13:20:01 -06:00
parent 262b2e42c5
commit a7d4b3200d
4 changed files with 12 additions and 20 deletions

View File

@ -581,44 +581,35 @@ class EyeProcessor:
self.current_algorithm = EyeInfoOrigin.BLOB
def ALGOSELECT(self):
# self.DADDYM()
# send the tracking algos previous fail number, in algo if we pass set to 0, if fail, + 1
if self.failed == 0 and self.firstalgo != None:
self.firstalgo()
else:
self.failed = self.failed + 1
if (
self.failed == 1 and self.secondalgo != None
): # send the tracking algos previous fail number, in algo if we pass set to 0, if fail, + 1
if self.failed == 1 and self.secondalgo != None:
self.secondalgo()
else:
self.failed = self.failed + 1
if self.failed == 2 and self.thirdalgo != None:
self.thirdalgo()
else:
self.failed = self.failed + 1
if self.failed == 3 and self.fourthalgo != None:
self.fourthalgo()
else:
self.failed = self.failed + 1
if self.failed == 4 and self.fithalgo != None:
self.fithalgo()
else:
self.failed = self.failed + 1
if self.failed == 5 and self.sixthalgo != None:
self.sixthalgo()
else:
self.failed = self.failed + 1
if self.failed == 6 and self.seventhalgo != None:
self.seventhalgo()
else:
self.failed = self.failed + 1
if self.failed == 7 and self.eigthalgo != None:
self.eigthalgo()
else:
@ -637,6 +628,7 @@ class EyeProcessor:
self.seventhalgo = None
self.eigthalgo = None
algolist = [None, None, None, None, None, None, None, None, None]
# clear HSF values when page is opened to correctly reflect setting changes
self.er_hsf = None
@ -665,7 +657,9 @@ class EyeProcessor:
)
else:
pass
algolist[self.settings.gui_HSFP] = self.HSFM
else:
if self.er_hsf is not None:
self.er_hsf = None
@ -688,6 +682,7 @@ class EyeProcessor:
)
else:
pass
algolist[self.settings.gui_HSRACP] = self.HSRACM
else:
if not self.settings.gui_HSF and self.er_hsf is not None:
@ -724,7 +719,7 @@ class EyeProcessor:
self.fithalgo,
self.sixthalgo,
self.seventhalgo,
self.eighthalgo,
self.eigthalgo,
) = algolist
f = True

View File

@ -258,9 +258,7 @@ class IntensityBasedOpeness:
# The same can be done with cv2.integral, but since there is only one area of the rectangle for which we want to know the total value, there is no advantage in terms of computational complexity.
intensity = frame_crop.sum() + 1
# cv2.imshow('e', frame)
# if cv2.waitKey(10) == 27:
# exit()
if len(self.filterlist) < filterSamples:
self.filterlist.append(intensity)
else:
@ -269,7 +267,7 @@ class IntensityBasedOpeness:
try:
if intensity >= np.percentile(
self.filterlist, 98
self.filterlist, 99
): # filter abnormally high values
# print('filter, assume blink')
intensity = self.maxval
@ -404,7 +402,7 @@ class IntensityBasedOpeness:
except:
pass
eyevec = abs(self.prev_val - eyeopen)
# eyevec = abs(self.prev_val - eyeopen)
# print(eyevec)
# if eyevec > 0.4:
# print("BLINK LCOK")

View File

@ -144,7 +144,6 @@ def output_osc(eye_x, eye_y, eye_blink, last_blink, pupil_dilation, avg_velocity
se = True
self.client.send_message("/avatar/parameters/v2/EyeX", eye_x)
self.client.send_message("/avatar/parameters/v2/EyeLeftX", eye_x)
self.client.send_message("/avatar/parameters/v2/EyeRightX", eye_x)
self.client.send_message("/avatar/parameters/v2/EyeLeftY", eye_y)

View File

@ -31,8 +31,8 @@ def velocity_falloff(self, var, out_x, out_y):
var.r_eye_x = out_x
var.right_y = out_y
else:
eye_x = var.l_eye_x
eye_y = var.left_y
out_x = var.l_eye_x
out_y = var.left_y
elif self.settings.gui_left_eye_dominant:
var.r_eye_x = out_x
var.right_y = out_y