mirror of
https://github.com/EyeTrackVR/EyeTrackVR.git
synced 2025-11-04 14:39:42 +08:00
Fix eye dilation and vrcft2 settings
This commit is contained in:
parent
61b2c88960
commit
6a9a27578d
@ -12,6 +12,7 @@ class AdvancedTrackingAlgoSettingsValidationModel(BaseValidationModel):
|
|||||||
gui_skip_autoradius: bool
|
gui_skip_autoradius: bool
|
||||||
gui_thresh_add: int
|
gui_thresh_add: int
|
||||||
gui_threshold: int
|
gui_threshold: int
|
||||||
|
gui_pupil_dilation: bool
|
||||||
|
|
||||||
|
|
||||||
class AdvancedTrackingAlgoSettingsModule(BaseSettingsModule):
|
class AdvancedTrackingAlgoSettingsModule(BaseSettingsModule):
|
||||||
@ -29,9 +30,19 @@ class AdvancedTrackingAlgoSettingsModule(BaseSettingsModule):
|
|||||||
|
|
||||||
self.gui_legacy_ransac_thresh_right = f"-THRESHRIGHT{widget_id}-"
|
self.gui_legacy_ransac_thresh_right = f"-THRESHRIGHT{widget_id}-"
|
||||||
self.gui_legacy_ransac_thresh_left = f"-THRESHLEFT{widget_id}-"
|
self.gui_legacy_ransac_thresh_left = f"-THRESHLEFT{widget_id}-"
|
||||||
|
self.gui_pupil_dilation = f"-EBPD{widget_id}-"
|
||||||
|
|
||||||
def get_layout(self):
|
def get_layout(self):
|
||||||
return [
|
return [
|
||||||
|
[sg.Text("Pupil Dilation Algo Settings:", background_color="#242224")],
|
||||||
|
[
|
||||||
|
sg.Checkbox(
|
||||||
|
"Ellipse Based Pupil Dilation",
|
||||||
|
default=self.config.gui_pupil_dilation,
|
||||||
|
key=self.gui_pupil_dilation,
|
||||||
|
background_color="#424042",
|
||||||
|
)
|
||||||
|
],
|
||||||
[sg.Text("Advanced Tracking Algorithm Settings:", background_color="#242224")],
|
[sg.Text("Advanced Tracking Algorithm Settings:", background_color="#242224")],
|
||||||
[
|
[
|
||||||
sg.Checkbox(
|
sg.Checkbox(
|
||||||
|
|||||||
@ -7,7 +7,6 @@ class GeneralSettingsValidationModel(BaseValidationModel):
|
|||||||
gui_flip_x_axis_left: bool
|
gui_flip_x_axis_left: bool
|
||||||
gui_flip_x_axis_right: bool
|
gui_flip_x_axis_right: bool
|
||||||
gui_flip_y_axis: bool
|
gui_flip_y_axis: bool
|
||||||
gui_vrc_native: bool
|
|
||||||
gui_eye_falloff: bool
|
gui_eye_falloff: bool
|
||||||
gui_update_check: bool
|
gui_update_check: bool
|
||||||
|
|
||||||
@ -20,7 +19,6 @@ class GeneralSettingsModule(BaseSettingsModule):
|
|||||||
self.gui_flip_x_axis_right = f"-FLIPXAXISRIGHT{widget_id}-"
|
self.gui_flip_x_axis_right = f"-FLIPXAXISRIGHT{widget_id}-"
|
||||||
self.gui_flip_y_axis = f"-FLIPYAXIS{widget_id}-"
|
self.gui_flip_y_axis = f"-FLIPYAXIS{widget_id}-"
|
||||||
self.gui_eye_falloff = f"-EYEFALLOFF{widget_id}-"
|
self.gui_eye_falloff = f"-EYEFALLOFF{widget_id}-"
|
||||||
self.gui_vrc_native = f"-VRCNATIVE{widget_id}-"
|
|
||||||
self.gui_update_check = f"-UPDATECHECK{widget_id}-"
|
self.gui_update_check = f"-UPDATECHECK{widget_id}-"
|
||||||
|
|
||||||
def get_layout(self):
|
def get_layout(self):
|
||||||
@ -52,13 +50,6 @@ class GeneralSettingsModule(BaseSettingsModule):
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
sg.Checkbox(
|
|
||||||
"VRC Native Eyetracking",
|
|
||||||
default=self.config.gui_vrc_native,
|
|
||||||
key=self.gui_vrc_native,
|
|
||||||
background_color="#424042",
|
|
||||||
tooltip="Toggle VRCFT output or VRC native",
|
|
||||||
),
|
|
||||||
sg.Checkbox(
|
sg.Checkbox(
|
||||||
"Dual Eye Falloff",
|
"Dual Eye Falloff",
|
||||||
default=self.config.gui_eye_falloff,
|
default=self.config.gui_eye_falloff,
|
||||||
|
|||||||
@ -10,6 +10,9 @@ class OSCValidationModel(BaseValidationModel):
|
|||||||
gui_osc_receiver_port: int
|
gui_osc_receiver_port: int
|
||||||
gui_osc_recenter_address: str
|
gui_osc_recenter_address: str
|
||||||
gui_osc_recalibrate_address: str
|
gui_osc_recalibrate_address: str
|
||||||
|
gui_vrc_native: bool
|
||||||
|
gui_osc_vrcft_v1: bool
|
||||||
|
gui_osc_vrcft_v2: bool
|
||||||
|
|
||||||
|
|
||||||
class OSCSettingsModule(BaseSettingsModule):
|
class OSCSettingsModule(BaseSettingsModule):
|
||||||
@ -22,12 +25,38 @@ class OSCSettingsModule(BaseSettingsModule):
|
|||||||
self.gui_osc_receiver_port = f"OSCRECEIVERPORT{widget_id}-"
|
self.gui_osc_receiver_port = f"OSCRECEIVERPORT{widget_id}-"
|
||||||
self.gui_osc_recenter_address = f"OSCRECENTERADDRESS{widget_id}-"
|
self.gui_osc_recenter_address = f"OSCRECENTERADDRESS{widget_id}-"
|
||||||
self.gui_osc_recalibrate_address = f"OSCRECALIBRATEADDRESS{widget_id}-"
|
self.gui_osc_recalibrate_address = f"OSCRECALIBRATEADDRESS{widget_id}-"
|
||||||
|
self.gui_vrc_native = f"-VRCNATIVE{widget_id}-"
|
||||||
|
self.gui_osc_vrcft_v1 = f"-OSCVRCFTV1{widget_id}-"
|
||||||
|
self.gui_osc_vrcft_v2 = f"-OSCVRCFTV2{widget_id}-"
|
||||||
|
|
||||||
def get_layout(self):
|
def get_layout(self):
|
||||||
return [
|
return [
|
||||||
[
|
[
|
||||||
sg.Text("OSC Settings:", background_color="#242224"),
|
sg.Text("OSC Settings:", background_color="#242224"),
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
sg.Checkbox(
|
||||||
|
"VRC Native Eyetracking",
|
||||||
|
default=self.config.gui_vrc_native,
|
||||||
|
key=self.gui_vrc_native,
|
||||||
|
background_color="#424042",
|
||||||
|
tooltip="Toggle VRCFT output or VRC native",
|
||||||
|
),
|
||||||
|
sg.Checkbox(
|
||||||
|
"VRCFT v1",
|
||||||
|
default=self.config.gui_osc_vrcft_v1,
|
||||||
|
key=self.gui_osc_vrcft_v1,
|
||||||
|
background_color="#424042",
|
||||||
|
tooltip="Toggle VRCFT's v1 Eyetracking format.",
|
||||||
|
),
|
||||||
|
sg.Checkbox(
|
||||||
|
"VRCFT v2 (UE)",
|
||||||
|
default=self.config.gui_osc_vrcft_v2,
|
||||||
|
key=self.gui_osc_vrcft_v2,
|
||||||
|
background_color="#424042",
|
||||||
|
tooltip="Toggle VRCFT's v2 (UE) Eyetracking format.",
|
||||||
|
),
|
||||||
|
],
|
||||||
[
|
[
|
||||||
sg.Text("Address:", background_color=BACKGROUND_COLOR),
|
sg.Text("Address:", background_color=BACKGROUND_COLOR),
|
||||||
sg.InputText(
|
sg.InputText(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user