From 1ecbde4f7bdebca922bc88b24513a5940cb6cfba Mon Sep 17 00:00:00 2001 From: Prohurtz <48768484+RedHawk989@users.noreply.github.com> Date: Mon, 2 Jan 2023 09:24:08 -0800 Subject: [PATCH] save priority values as int --- EyeTrackApp/eye_processor.py | 13 ++++++++++--- EyeTrackApp/settings_widget.py | 16 ++++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/EyeTrackApp/eye_processor.py b/EyeTrackApp/eye_processor.py index c6ccbb8..ff9b832 100644 --- a/EyeTrackApp/eye_processor.py +++ b/EyeTrackApp/eye_processor.py @@ -49,7 +49,7 @@ from one_euro_filter import OneEuroFilter if sys.platform.startswith("win"): from winsound import PlaySound, SND_FILENAME, SND_ASYNC - +import importlib from osc_calibrate_filter import * from haar_surround_feature import * from blob import * @@ -294,7 +294,7 @@ class EyeProcessor: def ALGOSELECT(self): - + print(self.failed, self.firstalgo) if self.failed == 0 and self.firstalgo != None: print('first') self.firstalgo() @@ -351,7 +351,8 @@ class EyeProcessor: elif self.settings.gui_RANSAC3D and self.settings.gui_RANSAC3DP == 4: self.fourthalgo = self.RANSAC3DM - if self.settings.gui_HSRAC and self.settings.gui_HSRACP == 1: + if self.settings.gui_HSRAC == True and self.settings.gui_HSRACP == 1: + print("HERE") self.firstalgo = self.HSRACM elif self.settings.gui_HSRAC and self.settings.gui_HSRACP == 2: self.secondalgo = self.HSRACM @@ -369,6 +370,12 @@ class EyeProcessor: elif self.settings.gui_BLOB and self.settings.gui_BLOBP == 4: self.fourthalgo = self.BLOBM + + if self.settings.gui_HSRACP == '1': + print("HERE") + + print(self.settings.gui_HSRACP, self.settings.gui_HSRAC, self.firstalgo) + f = True while True: # f = True diff --git a/EyeTrackApp/settings_widget.py b/EyeTrackApp/settings_widget.py index bc45073..f1140a4 100644 --- a/EyeTrackApp/settings_widget.py +++ b/EyeTrackApp/settings_widget.py @@ -374,24 +374,24 @@ class SettingsWidget: self.config.gui_flip_x_axis_left = values[self.gui_flip_x_axis_left] changed = True - if self.config.gui_HSFP != values[self.gui_HSFP]: - self.config.gui_HSFP = values[self.gui_HSFP] + if self.config.gui_HSFP != int(values[self.gui_HSFP]): + self.config.gui_HSFP = int(values[self.gui_HSFP]) changed = True if self.config.gui_HSF != values[self.gui_HSF]: self.config.gui_HSF = values[self.gui_HSF] changed = True - if self.config.gui_RANSAC3DP != values[self.gui_RANSAC3DP]: #TODO check that priority order is unique/auto fix it. - self.config.gui_RANSAC3DP = values[self.gui_RANSAC3DP] + if self.config.gui_RANSAC3DP != int(values[self.gui_RANSAC3DP]): #TODO check that priority order is unique/auto fix it. + self.config.gui_RANSAC3DP = int(values[self.gui_RANSAC3DP]) changed = True if self.config.gui_RANSAC3D != values[self.gui_RANSAC3D]: self.config.gui_RANSAC3D = values[self.gui_RANSAC3D] changed = True - if self.config.gui_HSRACP != values[self.gui_HSRACP]: - self.config.gui_HSRACP = values[self.gui_HSRACP] + if self.config.gui_HSRACP != int(values[self.gui_HSRACP]): + self.config.gui_HSRACP = int(values[self.gui_HSRACP]) changed = True if self.config.gui_HSRAC != values[self.gui_HSRAC]: @@ -414,8 +414,8 @@ class SettingsWidget: self.config.gui_BLOB = values[self.gui_BLOB] changed = True - if self.config.gui_BLOBP != values[self.gui_BLOBP]: - self.config.gui_BLOBP = values[self.gui_BLOBP] + if self.config.gui_BLOBP != int(values[self.gui_BLOBP]): + self.config.gui_BLOBP = int(values[self.gui_BLOBP]) changed = True if self.config.gui_threshold != values[self.gui_threshold_slider]: