Merge pull request #19 from RamesTheGeneric/main

More settings

Author: SummerSigh

.gitignore

@@ -7,3 +7,5 @@ BabbleApp/babble_settings.backup
 BabbleApp/build
 BabbleApp/dist
 /vivetest
+/training
+.vscode

BabbleApp/algo_settings_widget.py

@@ -15,6 +15,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
         self.gui_use_gpu = f"USEGPU{widget_id}"
         self.gui_speed_coefficient = f"-SPEEDCOEFFICIENT{widget_id}-"
         self.gui_min_cutoff = f"-MINCUTOFF{widget_id}-"
+        self.gui_inference_threads = f"-THREADS{widget_id}-"
         self.main_config = main_config
         self.config = main_config.settings
         self.osc_queue = osc_queue
@@ -37,6 +38,13 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
                 background_color='#424042',
                 tooltip="Toggle GPU execution.",
             ),
+            sg.Text("Inference Threads:", background_color='#424042'),
+                sg.InputText(
+                    self.config.gui_inference_threads,
+                    key=self.gui_inference_threads,
+                    size=(4),
+                    tooltip = "How many threads to use for processing the model.",
+            ),
             ],
             [sg.Text("Model output multiplier:", background_color='#424042'),
                 sg.InputText(
@@ -115,6 +123,10 @@ def render(self, window, event, values):
         if self.config.gui_use_gpu != values[self.gui_use_gpu]:
             self.config.gui_use_gpu = values[self.gui_use_gpu]
             changed = True
+        
+        if self.config.gui_inference_threads != int(values[self.gui_inference_threads]):
+            self.config.gui_inference_threads = int(values[self.gui_inference_threads]) 
+            changed = True
 
         if self.config.gui_min_cutoff != values[self.gui_min_cutoff]:
             self.config.gui_min_cutoff = values[self.gui_min_cutoff]

BabbleApp/babble_processor.py

@@ -85,8 +85,8 @@ def __init__(
         self.min_max_array = np.empty((2, 45))
 
         self.opts = ort.SessionOptions()
-        self.opts.intra_op_num_threads = 1
-        self.opts.inter_op_num_threads = 1
+        self.opts.intra_op_num_threads = settings.gui_inference_threads
+        self.opts.inter_op_num_threads = settings.gui_inference_threads
         self.opts.graph_optimization_level = ort.GraphOptimizationLevel.ORT_ENABLE_ALL
         if not self.use_gpu:
             self.sess = ort.InferenceSession(self.model, self.opts, providers=['CPUExecutionProvider'])

BabbleApp/camera.py

@@ -7,7 +7,7 @@
 import time
 
 from colorama import Fore
-from config import BabbleConfig
+from config import BabbleConfig, BabbleSettingsConfig
 from enum import Enum
 
 WAIT_TIME = 0.1
@@ -37,9 +37,11 @@ def __init__(
             capture_event: "threading.Event",
             camera_status_outgoing: "queue.Queue[CameraState]",
             camera_output_outgoing: "queue.Queue",
+            settings: BabbleSettingsConfig,
     ):
         self.camera_status = CameraState.CONNECTING
         self.config = config
+        self.settings = settings
         self.camera_index = camera_index
         self.camera_address = config.capture_source
         self.camera_status_outgoing = camera_status_outgoing
@@ -105,6 +107,9 @@ def run(self):
                             return
                         self.current_capture_source = self.config.capture_source
                         self.cv2_camera = cv2.VideoCapture(self.current_capture_source)
+                        if not self.settings.gui_cam_resolution_x == 0: self.cv2_camera.set(cv2.CAP_PROP_FRAME_WIDTH, self.settings.gui_cam_resolution_x)
+                        if not self.settings.gui_cam_resolution_y == 0: self.cv2_camera.set(cv2.CAP_PROP_FRAME_HEIGHT, self.settings.gui_cam_resolution_y)
+                        if not self.settings.gui_cam_framerate == 0: self.cv2_camera.set(cv2.CAP_PROP_FPS, self.settings.gui_cam_framerate)
                         should_push = False
             else:
                 # We don't have a capture source to try yet, wait for one to show up in the GUI.

BabbleApp/camera_widget.py

@@ -75,6 +75,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
             self.capture_event,
             self.camera_status_queue,
             self.capture_queue,
+            self.settings
         )
 
         self.roi_layout = [

BabbleApp/config.py

@@ -34,7 +34,11 @@ class BabbleSettingsConfig(BaseModel):
     gui_multiply: int = 1
     gui_model_file: str = 'Models/EFV2300K45E100P2.onnx'
     gui_use_gpu: bool = False
+    gui_inference_threads: int = 1
     calib_array: str = None
+    gui_cam_resolution_x: int = 0    
+    gui_cam_resolution_y: int = 0
+    gui_cam_framerate: int = 0
 
 class BabbleConfig(BaseModel):
     version: int = 1

BabbleApp/general_settings_widget.py

@@ -16,6 +16,9 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
         self.gui_ROSC = f"-ROSC{widget_id}-"
         self.gui_update_check = f"-UPDATECHECK{widget_id}-"
         self.gui_osc_location = f"-OSCLOCATION{widget_id}-"
+        self.gui_cam_resolution_x = f"-CAMRESX{widget_id}-"
+        self.gui_cam_resolution_y = f"-CAMRESY{widget_id}-"
+        self.gui_cam_framerate = f"-CAMFRAMERATE{widget_id}-"
         self.main_config = main_config
         self.config = main_config.settings
         self.osc_queue = osc_queue
@@ -93,7 +96,39 @@ def __init__(self, widget_id: Tab, main_config: BabbleSettingsConfig, osc_queue:
                     size=(0,10),
                     tooltip = "OSC address we use for recalibrating.",
                     ),
-            ]
+            ],
+            [
+                sg.Text("UVC Camera Settings:", background_color='#242224'),
+            ],
+            [
+                sg.Text("X Resolution:", background_color='#424042'),
+                sg.InputText(
+                    self.config.gui_cam_resolution_x, 
+                    key=self.gui_cam_resolution_x,
+                    size=(0,20),
+                    tooltip = "X capture resolution. Default = 0",
+                ),
+                
+          #  ],
+          #  [
+                sg.Text("Y Resolution:", background_color='#424042'),
+                sg.InputText(
+                    self.config.gui_cam_resolution_y, 
+                    key=self.gui_cam_resolution_y,
+                    size=(0,10),
+                    tooltip = "Y capture resolution. Default = 0",
+                ),
+                          
+          #  ],
+          #  [
+                sg.Text("Framerate:", background_color='#424042'),
+                sg.InputText(
+                    self.config.gui_cam_framerate, 
+                    key=self.gui_cam_framerate,
+                    size=(0,10),
+                    tooltip = "Capture framerate. Default = 0",
+                ),
+            ],
 
         ]
 
@@ -179,6 +214,17 @@ def render(self, window, event, values):
             self.config.gui_osc_location = values[self.gui_osc_location]
             changed = True
 
+        if self.config.gui_cam_resolution_x != int(values[self.gui_cam_resolution_x]):
+            self.config.gui_cam_resolution_x = int(values[self.gui_cam_resolution_x])
+            changed = True
+
+        if self.config.gui_cam_resolution_y != int(values[self.gui_cam_resolution_y]):
+            self.config.gui_cam_resolution_y = int(values[self.gui_cam_resolution_y])
+            changed = True
+
+        if self.config.gui_cam_framerate != int(values[self.gui_cam_framerate]):
+            self.config.gui_cam_framerate = int(values[self.gui_cam_framerate])
+            changed = True
 
         if changed:
             self.main_config.save()