Skip to content

Commit 50d03ce

Browse files
committed
add new model, remove notifs
1 parent 995db27 commit 50d03ce

File tree

8 files changed

+9
-66
lines changed

8 files changed

+9
-66
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ Glia_cap.py
2323
lazyass_minecraft_script.py
2424
scripts/example_build_app_and_installer.bat
2525
*.kdev*
26-
*.code-workspace
26+
*.code-workspace
27+
/BabbleBuilder

BabbleApp/babble_model_loader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
def run_model(self):
1818
if self.runtime in ("ONNX", "Default (ONNX)"):
19-
frame = cv2.resize(self.current_image_gray, (256, 256))
19+
frame = cv2.resize(self.current_image_gray, (224, 224))
2020
frame = transforms.to_tensor(frame)
2121
frame = transforms.unsqueeze(frame, 0)
2222
out = self.sess.run([self.output_name], {self.input_name: frame})

BabbleApp/babbleapp.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
from general_settings_widget import SettingsWidget
3333
from algo_settings_widget import AlgoSettingsWidget
3434
from calib_settings_widget import CalibSettingsWidget
35-
from notification_manager import NotificationManager
3635
from utils.misc_utils import ensurePath, os_type, bg_color_highlight, bg_color_clear
3736
from lang_manager import LocaleStringManager as lang
3837
from logger import setup_logging
@@ -182,12 +181,6 @@ async def async_main():
182181

183182
config.save()
184183

185-
notification_manager = NotificationManager()
186-
await notification_manager.initialize()
187-
188-
# Run the update check
189-
await check_for_updates(config, notification_manager)
190-
191184
# Uncomment for low-level Vive Facial Tracker logging
192185
# logging.basicConfig(filename='BabbleApp.log', filemode='w', encoding='utf-8', level=logging.INFO)
193186

BabbleApp/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class BabbleCameraConfig(BaseModel):
2525

2626

2727
class BabbleSettingsConfig(BaseModel):
28-
gui_min_cutoff: str = "0.9"
28+
gui_min_cutoff: str = "3"
2929
gui_speed_coefficient: str = "0.9"
3030
gui_osc_address: str = "127.0.0.1"
3131
gui_osc_port: int = 8888
@@ -38,7 +38,7 @@ class BabbleSettingsConfig(BaseModel):
3838
gui_ROSC: bool = False
3939
gui_osc_location: str = ""
4040
gui_multiply: float = 1
41-
gui_model_file: str = "Models/EFFB0E5BS224V6.3.4"
41+
gui_model_file: str = "Models/EFFB0E11BS128V7.5"
4242
gui_runtime: str = "ONNX"
4343
gui_use_gpu: bool = False
4444
gui_gpu_index: int = 0

BabbleApp/notification_manager.py

Lines changed: 0 additions & 51 deletions
This file was deleted.

scripts/build_app_and_installer.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:: File paths will all need to be updated to your setup
22

3-
set babblepath=X:\Documents\GitHub\ProjectBabble
3+
set babblepath=C:\Documents\GitHub\ProjectBabble
44
set innopath="C:\Program Files (x86)\Inno Setup 6"
55

66
cd /d %babblepath%\BabbleApp

scripts/installer.iss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ OutputDir=C:\Users\epicm\OneDrive\Desktop\build
2424
; Uncomment the following line to run in non administrative install mode (install for current user only.)
2525
;PrivilegesRequired=lowest
2626
OutputBaseFilename=Project_Babble-Setup
27-
SetupIconFile=X:\Documents\GitHub\ProjectBabble\BabbleApp\Images\logo.ico
27+
SetupIconFile=C:\Documents\GitHub\ProjectBabble\BabbleApp\Images\logo.ico
2828
Compression=lzma/ultra64
2929

3030
SolidCompression=yes
@@ -40,8 +40,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
4040
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
4141

4242
[Files]
43-
Source: "X:\Documents\GitHub\ProjectBabble\BabbleApp\dist\Babble_App\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
44-
Source: "X:\Documents\GitHub\ProjectBabble\BabbleApp\dist\Babble_App\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
43+
Source: "C:\Documents\GitHub\ProjectBabble\BabbleApp\dist\Babble_App\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
44+
Source: "C:\Documents\GitHub\ProjectBabble\BabbleApp\dist\Babble_App\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
4545
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
4646

4747
[Dirs]

0 commit comments

Comments
 (0)