add DADDY to settings

This commit is contained in:
Prohurtz 2023-03-17 10:53:35 -05:00
parent 5e2a2635f2
commit 237209ccf9
2 changed files with 58 additions and 27 deletions

View File

@ -24,11 +24,12 @@ class EyeTrackSettingsConfig(BaseModel):
gui_flip_x_axis_left: bool = False gui_flip_x_axis_left: bool = False
gui_flip_x_axis_right: bool = False gui_flip_x_axis_right: bool = False
gui_flip_y_axis: bool = False gui_flip_y_axis: bool = False
gui_RANSAC3D: bool = True gui_RANSAC3D: bool = False
gui_HSF: bool = True gui_HSF: bool = False
gui_BLOB: bool = False gui_BLOB: bool = False
gui_BLINK: bool = True gui_BLINK: bool = True
gui_HSRAC: bool = True gui_HSRAC: bool = True
gui_DADDY: bool = False
gui_HSF_radius: int = 15 gui_HSF_radius: int = 15
gui_min_cutoff: str = "0.0004" gui_min_cutoff: str = "0.0004"
gui_speed_coefficient: str = "0.9" gui_speed_coefficient: str = "0.9"
@ -45,9 +46,11 @@ class EyeTrackSettingsConfig(BaseModel):
gui_blink_sync: bool = False gui_blink_sync: bool = False
gui_threshold: int = 65 gui_threshold: int = 65
gui_HSRACP: int = 1 gui_HSRACP: int = 1
gui_RANSAC3DP: int = 2 gui_HSFP: int = 2
gui_HSFP: int = 3 gui_DADDYP: int = 3
gui_BLOBP: int = 4 gui_RANSAC3DP: int = 4
gui_BLOBP: int = 5
gui_skip_autoradius: bool = True gui_skip_autoradius: bool = True
gui_thresh_add: int = 20 gui_thresh_add: int = 20
gui_update_check: bool = True gui_update_check: bool = True

View File

@ -22,6 +22,8 @@ class SettingsWidget:
self.gui_osc_recalibrate_address = f"OSCRECALIBRATEADDRESS{widget_id}-" self.gui_osc_recalibrate_address = f"OSCRECALIBRATEADDRESS{widget_id}-"
self.gui_BLOB = f"-BLOBFALLBACK{widget_id}-" self.gui_BLOB = f"-BLOBFALLBACK{widget_id}-"
self.gui_HSF = f"-HSF{widget_id}-" self.gui_HSF = f"-HSF{widget_id}-"
self.gui_DADDY = f"-DADDY{widget_id}-"
self.gui_DADDYP = f"-DADDYP{widget_id}-"
self.gui_RANSAC3D = f"-RANSAC3D{widget_id}-" self.gui_RANSAC3D = f"-RANSAC3D{widget_id}-"
self.gui_BLINK = f"-BLINK{widget_id}-" self.gui_BLINK = f"-BLINK{widget_id}-"
self.gui_HSRAC = f"-HSRAC{widget_id}-" self.gui_HSRAC = f"-HSRAC{widget_id}-"
@ -111,7 +113,7 @@ class SettingsWidget:
tooltip = "Our newest algoritim, utilizing both HSF and RANSAC for best tracking quality and lighting resistance.", tooltip = "Our newest algoritim, utilizing both HSF and RANSAC for best tracking quality and lighting resistance.",
), ),
sg.Combo(['1','2','3','4'], sg.Combo(['1','2','3','4'],
default_value=self.config.gui_HSRAC, default_value=self.config.gui_HSRACP,
key=self.gui_HSRACP, key=self.gui_HSRACP,
background_color='#424042', background_color='#424042',
text_color='white', text_color='white',
@ -121,6 +123,43 @@ class SettingsWidget:
), ),
sg.Text("HSRAC", background_color='#424042'), sg.Text("HSRAC", background_color='#424042'),
], ],
[
sg.Checkbox(
"",
default=self.config.gui_HSF,
key=self.gui_HSF,
background_color='#424042',
tooltip = "HSF Is a new, lower resolution tracking algorithim that provides excelent resilancy to lighting conditions and great speed.",
),
sg.Combo(['1','2','3','4','5'],
default_value=self.config.gui_HSFP,
key=self.gui_HSFP,
background_color='#424042',
text_color='white',
button_arrow_color= "black",
button_background_color = "#6f4ca1",
tooltip = "Select the priority of eyetracking algorithims.",
),
sg.Text("Haar Surround Feature", background_color='#424042'),
],
[sg.Checkbox(
"",
default=self.config.gui_DADDY,
key=self.gui_DADDY,
background_color='#424042',
tooltip = "Our newest algoritim, utilizing both HSF and RANSAC for best tracking quality and lighting resistance.",
),
sg.Combo(['1','2','3','4','5'],
default_value=self.config.gui_DADDYP,
key=self.gui_DADDYP,
background_color='#424042',
text_color='white',
button_arrow_color= "black",
button_background_color = "#6f4ca1",
tooltip = "Select the priority of eyetracking algorithims.",
),
sg.Text("DADDY", background_color='#424042'),
],
[ [
sg.Checkbox( sg.Checkbox(
"", "",
@ -129,7 +168,7 @@ class SettingsWidget:
background_color='#424042', background_color='#424042',
tooltip = "RANSAC3D provides good tracking quality, however does not do well in bad lighting conditions.", tooltip = "RANSAC3D provides good tracking quality, however does not do well in bad lighting conditions.",
), ),
sg.Combo(['1','2','3','4'], sg.Combo(['1','2','3','4','5'],
default_value=self.config.gui_RANSAC3DP, default_value=self.config.gui_RANSAC3DP,
key=self.gui_RANSAC3DP, key=self.gui_RANSAC3DP,
background_color='#424042', background_color='#424042',
@ -140,25 +179,6 @@ class SettingsWidget:
), ),
sg.Text("RANSAC 3D", background_color='#424042'), sg.Text("RANSAC 3D", background_color='#424042'),
], ],
[
sg.Checkbox(
"",
default=self.config.gui_HSF,
key=self.gui_HSF,
background_color='#424042',
tooltip = "HSF Is a new, lower resolution tracking algorithim that provides excelent resilancy to lighting conditions and great speed.",
),
sg.Combo(['1','2','3','4'],
default_value=self.config.gui_HSFP,
key=self.gui_HSFP,
background_color='#424042',
text_color='white',
button_arrow_color= "black",
button_background_color = "#6f4ca1",
tooltip = "Select the priority of eyetracking algorithims.",
),
sg.Text("Haar Surround Feature", background_color='#424042'),
],
[ [
sg.Checkbox( sg.Checkbox(
"", "",
@ -167,7 +187,7 @@ class SettingsWidget:
background_color='#424042', background_color='#424042',
tooltip = "Blob tracking is the oldest and worst tracking algorithm, it provides fast, though sometimes innaccurate tracking.", tooltip = "Blob tracking is the oldest and worst tracking algorithm, it provides fast, though sometimes innaccurate tracking.",
), ),
sg.Combo(['1','2','3','4'], sg.Combo(['1','2','3','4','5'],
default_value=self.config.gui_BLOBP, default_value=self.config.gui_BLOBP,
key=self.gui_BLOBP, key=self.gui_BLOBP,
background_color='#424042', background_color='#424042',
@ -409,6 +429,14 @@ class SettingsWidget:
if self.config.gui_HSF != values[self.gui_HSF]: if self.config.gui_HSF != values[self.gui_HSF]:
self.config.gui_HSF = values[self.gui_HSF] self.config.gui_HSF = values[self.gui_HSF]
changed = True changed = True
if self.config.gui_DADDYP != int(values[self.gui_DADDYP]):
self.config.gui_DADDYP = int(values[self.gui_DADDYP])
changed = True
if self.config.gui_DADDY != values[self.gui_DADDY]:
self.config.gui_DADDY = values[self.gui_DADDY]
changed = True
if self.config.gui_RANSAC3DP != int(values[self.gui_RANSAC3DP]): #TODO check that priority order is unique/auto fix it. 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]) self.config.gui_RANSAC3DP = int(values[self.gui_RANSAC3DP])