From e621c8197c03a8e9a26e4be6347c39d30fd5518e Mon Sep 17 00:00:00 2001 From: Prohurtz <48768484+RedHawk989@users.noreply.github.com> Date: Sat, 1 Apr 2023 15:23:11 -0700 Subject: [PATCH 1/2] fix linux compatibility, add requests to poetry --- EyeTrackApp/eyetrackapp.py | 3 ++- pyproject.toml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/EyeTrackApp/eyetrackapp.py b/EyeTrackApp/eyetrackapp.py index 9eaead8..eb85dea 100644 --- a/EyeTrackApp/eyetrackapp.py +++ b/EyeTrackApp/eyetrackapp.py @@ -10,7 +10,8 @@ import threading import PySimpleGUI as sg import os import requests -from winotify import Notification +if is_nt: + from winotify import Notification os.system('color') # init ANSI color # Random environment variable to speed up webcam opening on the MSMF backend. diff --git a/pyproject.toml b/pyproject.toml index c3d8138..aad5638 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,6 +14,7 @@ numpy = "~1.23.5" pye3d = "^0.3.1.post1" pysimplegui = "^4.60.4" pydantic = "^1.10.2" +requests = "~2.2.8.2" winotify = [ { version = "^1.1.0", platform = 'win32' } ] From 41217898751ff8a7c60416e0bf7aa6171ff691a7 Mon Sep 17 00:00:00 2001 From: Prohurtz <48768484+RedHawk989@users.noreply.github.com> Date: Sat, 1 Apr 2023 15:38:25 -0700 Subject: [PATCH 2/2] format settings page better for high res screens --- EyeTrackApp/settings_widget.py | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/EyeTrackApp/settings_widget.py b/EyeTrackApp/settings_widget.py index 6b593df..64fbb29 100644 --- a/EyeTrackApp/settings_widget.py +++ b/EyeTrackApp/settings_widget.py @@ -67,8 +67,9 @@ class SettingsWidget: tooltip = "Flips the right eye's X axis.", ), - ], - [sg.Checkbox( + # ], + #[ + sg.Checkbox( "Flip Y Axis", default=self.config.gui_flip_y_axis, key=self.gui_flip_y_axis, @@ -198,8 +199,8 @@ class SettingsWidget: key=self.gui_IBO, background_color='#424042', ), - ], - [ + # ], + # [ sg.Checkbox( "Bianary Blink Algo", default=self.config.gui_BLINK, @@ -278,13 +279,15 @@ class SettingsWidget: sg.InputText( self.config.gui_min_cutoff, key=self.gui_min_cutoff, + size=(0,10), ), - ], - [ + #], + #[ sg.Text("Speed Coefficient", background_color='#424042'), sg.InputText( self.config.gui_speed_coefficient, key=self.gui_speed_coefficient, + size=(0,10), ), ], [ @@ -295,15 +298,17 @@ class SettingsWidget: sg.InputText( self.config.gui_osc_address, key=self.gui_osc_address, + size=(0,20), tooltip = "IP address we send OSC data to.", ), - ], - [ + # ], + # [ sg.Text("Port:", background_color='#424042'), sg.InputText( self.config.gui_osc_port, key=self.gui_osc_port, + size=(0,10), tooltip = "OSC port we send data to.", ), ], @@ -314,6 +319,7 @@ class SettingsWidget: default=self.config.gui_ROSC, key=self.gui_ROSC, background_color='#424042', + size=(0,10), tooltip = "Toggle OSC receive functions.", ), ], @@ -322,14 +328,16 @@ class SettingsWidget: sg.InputText( self.config.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.", ), - ], - [ + #], + # [ sg.Text("Recenter Address:", background_color='#424042'), sg.InputText( self.config.gui_osc_recenter_address, key=self.gui_osc_recenter_address, + size=(0,10), tooltip = "OSC Address used for recentering your eye.", ), ], @@ -338,6 +346,7 @@ class SettingsWidget: sg.InputText( self.config.gui_osc_recalibrate_address, key=self.gui_osc_recalibrate_address, + size=(0,10), tooltip = "OSC address we use for recalibrating your eye", ), ]