From 29f405f4e86f3fd9e39ecdb6dfe2ace4a42484fd Mon Sep 17 00:00:00 2001 From: Rames The Generic Date: Mon, 21 Oct 2024 18:09:47 -0400 Subject: [PATCH] Save valid int inputs as ints --- BabbleApp/camera.py | 1 - BabbleApp/camera_widget.py | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BabbleApp/camera.py b/BabbleApp/camera.py index b312817..2095daa 100644 --- a/BabbleApp/camera.py +++ b/BabbleApp/camera.py @@ -43,7 +43,6 @@ class Camera: 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 diff --git a/BabbleApp/camera_widget.py b/BabbleApp/camera_widget.py index 9120355..8c80d52 100644 --- a/BabbleApp/camera_widget.py +++ b/BabbleApp/camera_widget.py @@ -15,6 +15,7 @@ from utils.misc_utils import ( get_camera_index_by_name, bg_color_highlight, bg_color_clear, + is_valid_int_input ) from lang_manager import LocaleStringManager as lang @@ -324,11 +325,11 @@ class CameraWidget: 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 @@ class CameraWidget: 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("info.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