working on camera-manager
This commit is contained in:
@@ -4,7 +4,7 @@ from core.database import DatabaseManager
|
||||
from core.media import MediaRepository
|
||||
from ui.widgets.color_list_widget import ColorListWidget
|
||||
from ui.widgets.thumbnail_list_widget import ThumbnailListWidget
|
||||
from ui.widgets.split_view_widget import SplitView
|
||||
from ui.widgets.split_view_widget import SplitView, CameraPlaceholder
|
||||
# from .camera_controller import CameraController
|
||||
from core.camera.camera_controller import CameraController
|
||||
from core.camera.camera_manager import CameraManager
|
||||
@@ -23,8 +23,9 @@ class MainController:
|
||||
# camera = GPhotoCamera()
|
||||
# self.manager = CameraController(camera)
|
||||
manager = CameraManager()
|
||||
manager.detect_gphoto()
|
||||
manager.detect_opencv()
|
||||
# manager.detect_gphoto()
|
||||
# manager.detect_opencv()
|
||||
manager.detect_camera()
|
||||
|
||||
# self.camera_controller = CameraController()
|
||||
|
||||
@@ -32,6 +33,7 @@ class MainController:
|
||||
self.color_list: ColorListWidget = view.color_list_widget
|
||||
self.thumbnail_list: ThumbnailListWidget = view.thumbnail_widget
|
||||
self.split_view: SplitView = view.preview_widget
|
||||
self.welcome_view: CameraPlaceholder = self.split_view.widget_start
|
||||
|
||||
self.photo_button: QPushButton = view.photo_button
|
||||
self.photo_button.clicked.connect(self.take_photo)
|
||||
@@ -50,6 +52,9 @@ class MainController:
|
||||
# self.split_view.widget_start.camera_start_btn.clicked.connect(self.camera_controller.start)
|
||||
self.split_view.widget_start.camera_start_btn.clicked.connect(self.start_liveview)
|
||||
|
||||
self.welcome_view.set_button_text("tada")
|
||||
self.welcome_view.set_error_text("errorsy")
|
||||
|
||||
|
||||
def start_camera(self):
|
||||
pass
|
||||
@@ -97,4 +102,60 @@ class MainController:
|
||||
|
||||
def shutdown(self):
|
||||
pass
|
||||
# self.manager.stop()
|
||||
# self.manager.stop()
|
||||
|
||||
|
||||
|
||||
# @Slot(list)
|
||||
def on_cameras_detected(self, cameras: list[dict]):
|
||||
print("Wykryto kamery:", cameras)
|
||||
# Tutaj zaktualizuj swój ComboBox w UI, np.:
|
||||
# self.main_window.camera_combobox.clear()
|
||||
# for camera in cameras:
|
||||
# self.main_window.camera_combobox.addItem(camera['name'], userData=camera['id'])
|
||||
|
||||
# @Slot(QPixmap)
|
||||
def on_frame_ready(self, pixmap: QPixmap):
|
||||
# Tutaj zaktualizuj widget wyświetlający obraz, np. QLabel
|
||||
# self.main_window.video_label.setPixmap(pixmap)
|
||||
pass
|
||||
|
||||
# @Slot(str)
|
||||
def on_camera_error(self, error_message: str):
|
||||
print(f"Błąd kamery: {error_message}")
|
||||
# Wyświetl błąd w UI, np. w status barze
|
||||
# self.main_window.statusBar().showMessage(error_message, 5000)
|
||||
|
||||
# @Slot()
|
||||
def on_camera_started(self):
|
||||
# Zmień stan UI, np. tekst przycisku na "Stop"
|
||||
# self.main_window.toggle_camera_button.setText("Stop")
|
||||
pass
|
||||
|
||||
# @Slot()
|
||||
def on_camera_stopped(self):
|
||||
# Zmień stan UI, np. tekst przycisku na "Start"
|
||||
# self.main_window.toggle_camera_button.setText("Start")
|
||||
pass
|
||||
|
||||
def toggle_camera(self):
|
||||
# Logika do przełączania start/stop
|
||||
if self.camera_manager.get_active_camera_info():
|
||||
self.camera_manager.stop_camera()
|
||||
else:
|
||||
# Pobierz ID kamery z ComboBoxa
|
||||
# camera_id = self.main_window.camera_combobox.currentData()
|
||||
# if camera_id:
|
||||
# self.camera_manager.start_camera(camera_id)
|
||||
pass
|
||||
|
||||
def on_camera_selected(self, index: int):
|
||||
# Automatycznie uruchom kamerę po wybraniu z listy
|
||||
# camera_id = self.main_window.camera_combobox.itemData(index)
|
||||
# if camera_id:
|
||||
# self.camera_manager.start_camera(camera_id)
|
||||
pass
|
||||
|
||||
def cleanup(self):
|
||||
# Wywołaj to przy zamykaniu aplikacji
|
||||
self.camera_manager.shutdown()
|
||||
Reference in New Issue
Block a user