From 196eff7fd8378f9ef2764e04ab111eb590a95ca5 Mon Sep 17 00:00:00 2001
From: bartool <bartoolina@gmail.com>
Date: Tue, 30 Sep 2025 18:58:56 +0200
Subject: [PATCH] refacot: change name from CameraManager to CameraController.
 Add set_camera nad cleanup code.

---
 ...camera_manager.py => camera_controller.py} | 91 ++++++++++++-------
 1 file changed, 59 insertions(+), 32 deletions(-)
 rename core/camera/{camera_manager.py => camera_controller.py} (54%)

diff --git a/core/camera/camera_manager.py b/core/camera/camera_controller.py
similarity index 54%
rename from core/camera/camera_manager.py
rename to core/camera/camera_controller.py
index 31f7616..bb8b3c9 100644
--- a/core/camera/camera_manager.py
+++ b/core/camera/camera_controller.py
@@ -1,39 +1,52 @@
-from PySide6.QtCore import QObject, QThread, QTimer, Signal, Slot
+from PySide6.QtCore import QObject, QThread, QTimer, Signal, Slot, QMutex, QMutexLocker
 from PySide6.QtGui import QImage, QPixmap
 import cv2
 
 from .base_camera import BaseCamera
 
 
-class CameraManager(QThread):
+class CameraController(QThread):
     frame_ready = Signal(QPixmap)
     photo_ready = Signal(QPixmap)
     error_occurred = Signal(str)
+    _enable_timer = Signal(bool)
 
-    def __init__(self, camera: BaseCamera, fps: int = 15, parent: QObject | None = None) -> None:
+
+    def __init__(self, parent: QObject | None = None) -> None:
         super().__init__(parent)
-        self.camera = camera
-        self.fps = fps
+        self.camera = None
         self.timer = None
+        self.fps = 15
         self.is_streaming = False
-
         self.is_connected = False
 
-        self.timer = QTimer()
-        self.timer.setInterval(int(1000 / self.fps))
-        self.timer.timeout.connect(self._update_frame)
+        self._camera_mutex = QMutex()
         self.start()
 
+
     def run(self) -> None:
-        # self.timer = QTimer()
-        # self.timer.setInterval(int(1000 / self.fps))
-        # self.timer.timeout.connect(self._update_frame)
+        self.timer = QTimer()
+        self.timer.timeout.connect(self._update_frame)
+        self._enable_timer.connect(self._set_timer)
         self.exec()
+ 
+    def stop(self):
+        self.stop_camera()
+        self.quit()
+        self.wait()
+
+    def set_camera(self, camera: BaseCamera, fps: int = 15) -> None:
+        with QMutexLocker(self._camera_mutex):
+            self.stop_stream()
+            self.stop_camera()
+
+            self.camera = camera
+            self.fps = fps
 
     def start_camera(self) -> None:
-        if self.is_connected:
+        if self.camera is None or self.is_connected:
             return
-        
+
         if self.camera.connect():
             self.is_connected = True
         else:
@@ -41,38 +54,46 @@ class CameraManager(QThread):
             self.error_occurred.emit(self.camera.get_error_msg())
 
     def stop_camera(self) -> None:
-        self.is_streaming = False
+        if self.is_streaming:
+            self.stop_stream()
+
+        if self.camera is not None:
+            self.camera.disconnect()
+
         self.is_connected = False
-        if self.timer:
-            self.timer.stop()
-        self.camera.disconnect()
 
     def start_stream(self):
         if not self.is_connected:
             return
-        
+
         if self.is_streaming:
             return
-        
+
         if self.timer:
             self.is_streaming = True
-            self.timer.start()
+            # self.timer.start()
+            self._enable_timer.emit(True)
 
     def stop_stream(self) -> None:
         if self.is_streaming:
             self.is_streaming = False
             if self.timer:
-                self.timer.stop()
+                # self.timer.stop()
+                self._enable_timer.emit(False)
 
     def _update_frame(self) -> None:
-        if not self.is_streaming or not self.is_connected:
-            return
+        with QMutexLocker(self._camera_mutex):
+            if self.camera is None or not self.is_connected:
+                return
+        
+            if not self.is_streaming:
+                return
 
-        ret, frame = self.camera.get_frame()
+            ret, frame = self.camera.get_frame()
 
-        if not ret:
-            self.error_occurred.emit(self.camera.get_error_msg())
-            return
+            if not ret:
+                self.error_occurred.emit(self.camera.get_error_msg())
+                return
 
         if frame is not None:
             rgb_image = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
@@ -82,7 +103,13 @@ class CameraManager(QThread):
 
             self.frame_ready.emit(pixmap)
 
-    def stop(self):
-        self.stop_camera()
-        self.quit()
-        self.wait()
+    def _set_timer(self, enable: bool):
+        if not self.timer:
+            return
+        
+        if enable:
+            self.timer.setInterval(int(1000 / self.fps))
+            self.timer.start()
+        else:
+            self.timer.stop()
+