Merge pull request #58 from RamesTheGeneric/main

Fix missing locale entries

Author: dfgHiatus

BabbleApp/Locale/English/locale.json

@@ -55,6 +55,7 @@
 	"info.enterCaptureTwo": "not found, retrying...",
 	"info.exitCaptureThread": "Exiting capture thread",
 	"info.exitTrackingThread": "Exiting tracking thread",
+	"info.serialCapture": "Failed to get serial picture",
 	"log.info": "INFO",
 	"log.warn": "WARN",
 	"log.error": "ERROR",

BabbleApp/Locale/OwO/locale.json

@@ -55,6 +55,7 @@
 	"info.enterCaptureTwo": "not found, retrying...",
 	"info.exitCaptureThread": "Exiting capture thread",
 	"info.exitTrackingThread": "Exiting tracking thread",
+	"info.serialCapture": "Fawled to gwet seiewal pictower 3:",
 	"log.info": "INFO",
 	"log.warn": "WARN",
 	"log.error": "ERROR",

BabbleApp/Locale/Pirate Speak/locale.json

@@ -55,6 +55,7 @@
 	"info.enterCaptureTwo": "not found, retrying...",
 	"info.exitCaptureThread": "Exiting capture thread",
 	"info.exitTrackingThread": "Exiting tracking thread",
+	"info.serialCapture": "Failed to get serial piccure, matey!",
 	"log.info": "INFO",
 	"log.warn": "WARN",
 	"log.error": "ERROR",

BabbleApp/camera.py

@@ -43,7 +43,6 @@ def __init__(
         camera_output_outgoing: "queue.Queue(maxsize=2)",
         settings: BabbleSettingsConfig,
     ):
-        self.current_capture_sourc = None
         self.camera_status = CameraState.CONNECTING
         self.config = config
         self.settings = settings

BabbleApp/camera_widget.py

@@ -15,6 +15,7 @@
     get_camera_index_by_name,
     bg_color_highlight,
     bg_color_clear,
+    is_valid_int_input
 )
 from lang_manager import LocaleStringManager as lang
 
@@ -63,7 +64,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
         self.capture_event = Event()
         self.capture_queue = Queue(maxsize=2)
         self.roi_queue = Queue(maxsize=2)
-        self.image_queue = Queue(maxsize=4)
+        self.image_queue = Queue(maxsize=500) # This is needed to prevent the UI from freezing during widget changes. 
 
         self.babble_cnn = BabbleProcessor(
             self.config,
@@ -134,14 +135,14 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
                     key=self.gui_restart_calibration,
                     button_color=button_color,
                     tooltip=lang._instance.get_string("camera.startCalibrationTooltip"),
-                    disabled=True,
+                    disabled=not self.settings_config.use_calibration,
                 ),
                 sg.Button(
                     lang._instance.get_string("camera.stopCalibration"),
                     key=self.gui_stop_calibration,
                     button_color=button_color,
                     tooltip=lang._instance.get_string("camera.startCalibrationTooltip"),
-                    disabled=True,
+                    disabled=not self.settings_config.use_calibration,
                 ),
             ],
             [
@@ -324,11 +325,11 @@ def render(self, window, event, values):
                 if any(x in str(value) for x in ports):
                     self.config.capture_source = value
                 else:
-                    cam = get_camera_index_by_name(
-                        value
-                    )  # Set capture_source to the UVC index. Otherwise treat value like an ipcam if we return none
+                    cam = get_camera_index_by_name(value)   # Set capture_source to the UVC index. Otherwise treat value like an ipcam if we return none
                     if cam != None:
-                        self.config.capture_source = get_camera_index_by_name(value)
+                        self.config.capture_source = cam
+                    elif is_valid_int_input(value): 
+                        self.config.capture_source = int(value)
                     else:
                         self.config.capture_source = value
             except ValueError:
@@ -395,11 +396,11 @@ def render(self, window, event, values):
             if self.settings_config.use_calibration == True:
                 window[self.gui_restart_calibration].update(disabled=False)
                 window[self.gui_stop_calibration].update(disabled=False)
-                print({lang._instance.get_string("info.enabled")})
+                print(f'[{lang._instance.get_string("log.info")}] {lang._instance.get_string("info.enabled")}')
             else:
                 window[self.gui_restart_calibration].update(disabled=True)
                 window[self.gui_stop_calibration].update(disabled=True)
-                print(lang._instance.get_string("algoritm.disabled"))
+                print(f'[{lang._instance.get_string("log.info")}] {lang._instance.get_string("info.disabled")}')
 
         if event == "{}+UP".format(self.gui_roi_selection):
             # Event for mouse button up in ROI mode