Merge branch 'HSF-and-new-algos-feature-branch' into feature/dev_container

This commit is contained in:
Prohurtz 2023-04-06 14:00:39 -07:00 committed by GitHub
commit 33ec3f20d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 14 deletions

View File

@ -11,11 +11,9 @@ import PySimpleGUI as sg
import os import os
import requests import requests
try: if is_nt:
from winotify import Notification from winotify import Notification
except ImportError: os.system('color') # init ANSI color
print("Notifications not supported")
os.system("color") # init ANSI color
# Random environment variable to speed up webcam opening on the MSMF backend. # Random environment variable to speed up webcam opening on the MSMF backend.
# https://github.com/opencv/opencv/issues/17687 # https://github.com/opencv/opencv/issues/17687

View File

@ -67,8 +67,9 @@ class SettingsWidget:
tooltip = "Flips the right eye's X axis.", tooltip = "Flips the right eye's X axis.",
), ),
], # ],
[sg.Checkbox( #[
sg.Checkbox(
"Flip Y Axis", "Flip Y Axis",
default=self.config.gui_flip_y_axis, default=self.config.gui_flip_y_axis,
key=self.gui_flip_y_axis, key=self.gui_flip_y_axis,
@ -198,8 +199,8 @@ class SettingsWidget:
key=self.gui_IBO, key=self.gui_IBO,
background_color='#424042', background_color='#424042',
), ),
], # ],
[ # [
sg.Checkbox( sg.Checkbox(
"Bianary Blink Algo", "Bianary Blink Algo",
default=self.config.gui_BLINK, default=self.config.gui_BLINK,
@ -278,13 +279,15 @@ class SettingsWidget:
sg.InputText( sg.InputText(
self.config.gui_min_cutoff, self.config.gui_min_cutoff,
key=self.gui_min_cutoff, key=self.gui_min_cutoff,
size=(0,10),
), ),
], #],
[ #[
sg.Text("Speed Coefficient", background_color='#424042'), sg.Text("Speed Coefficient", background_color='#424042'),
sg.InputText( sg.InputText(
self.config.gui_speed_coefficient, self.config.gui_speed_coefficient,
key=self.gui_speed_coefficient, key=self.gui_speed_coefficient,
size=(0,10),
), ),
], ],
[ [
@ -295,15 +298,17 @@ class SettingsWidget:
sg.InputText( sg.InputText(
self.config.gui_osc_address, self.config.gui_osc_address,
key=self.gui_osc_address, key=self.gui_osc_address,
size=(0,20),
tooltip = "IP address we send OSC data to.", tooltip = "IP address we send OSC data to.",
), ),
], # ],
[ # [
sg.Text("Port:", background_color='#424042'), sg.Text("Port:", background_color='#424042'),
sg.InputText( sg.InputText(
self.config.gui_osc_port, self.config.gui_osc_port,
key=self.gui_osc_port, key=self.gui_osc_port,
size=(0,10),
tooltip = "OSC port we send data to.", tooltip = "OSC port we send data to.",
), ),
], ],
@ -314,6 +319,7 @@ class SettingsWidget:
default=self.config.gui_ROSC, default=self.config.gui_ROSC,
key=self.gui_ROSC, key=self.gui_ROSC,
background_color='#424042', background_color='#424042',
size=(0,10),
tooltip = "Toggle OSC receive functions.", tooltip = "Toggle OSC receive functions.",
), ),
], ],
@ -322,14 +328,16 @@ class SettingsWidget:
sg.InputText( sg.InputText(
self.config.gui_osc_receiver_port, self.config.gui_osc_receiver_port,
key=self.gui_osc_receiver_port, key=self.gui_osc_receiver_port,
size=(0,10),
tooltip = "Port we receive OSC data from (used to recalibrate or recenter app from within VRChat.", tooltip = "Port we receive OSC data from (used to recalibrate or recenter app from within VRChat.",
), ),
], #],
[ # [
sg.Text("Recenter Address:", background_color='#424042'), sg.Text("Recenter Address:", background_color='#424042'),
sg.InputText( sg.InputText(
self.config.gui_osc_recenter_address, self.config.gui_osc_recenter_address,
key=self.gui_osc_recenter_address, key=self.gui_osc_recenter_address,
size=(0,10),
tooltip = "OSC Address used for recentering your eye.", tooltip = "OSC Address used for recentering your eye.",
), ),
], ],
@ -338,6 +346,7 @@ class SettingsWidget:
sg.InputText( sg.InputText(
self.config.gui_osc_recalibrate_address, self.config.gui_osc_recalibrate_address,
key=self.gui_osc_recalibrate_address, key=self.gui_osc_recalibrate_address,
size=(0,10),
tooltip = "OSC address we use for recalibrating your eye", tooltip = "OSC address we use for recalibrating your eye",
), ),
] ]

View File

@ -15,6 +15,7 @@ numpy = "~1.23.5"
pye3d = "^0.3.1.post1" pye3d = "^0.3.1.post1"
pysimplegui = "^4.60.4" pysimplegui = "^4.60.4"
pydantic = "^1.10.2" pydantic = "^1.10.2"
requests = "~2.2.8.2"
winotify = [ winotify = [
{ version = "^1.1.0", platform = 'win32' } { version = "^1.1.0", platform = 'win32' }
] ]