Compare commits
17 Commits
ab266c2767
...
dev-camera
| Author | SHA1 | Date | |
|---|---|---|---|
| c815762f72 | |||
| ca25b06f99 | |||
| dea17b8b26 | |||
| 324ab2e016 | |||
| 196eff7fd8 | |||
| e2c8352c44 | |||
| dcf4ef0f0a | |||
| 1ff5091250 | |||
| 373e01310e | |||
| abc07fd08d | |||
| 35576986c9 | |||
| 19e2c7977c | |||
| 508930ae39 | |||
| 2187536c7d | |||
| 6133c9fb18 | |||
| e006fea037 | |||
| 6acb690f16 |
97
controllers/camera_controller.py
Normal file
97
controllers/camera_controller.py
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
# import gphoto2 as gp
|
||||||
|
import numpy as np
|
||||||
|
import cv2
|
||||||
|
|
||||||
|
from PySide6.QtCore import QObject, QThread, Signal
|
||||||
|
from PySide6.QtGui import QImage, QPixmap
|
||||||
|
|
||||||
|
# try:
|
||||||
|
# import gphoto2 as gp
|
||||||
|
# except:
|
||||||
|
from . import mock_gphoto as gp
|
||||||
|
|
||||||
|
class CameraWorker(QObject):
|
||||||
|
frameReady = Signal(QPixmap)
|
||||||
|
errorOccurred = Signal(str)
|
||||||
|
|
||||||
|
def __init__(self, fps: int = 15, parent=None):
|
||||||
|
super().__init__(parent)
|
||||||
|
self.fps = fps
|
||||||
|
self.running = False
|
||||||
|
self.camera = None
|
||||||
|
|
||||||
|
def start_camera(self):
|
||||||
|
"""Uruchom kamerę i zacznij pobierać klatki"""
|
||||||
|
try:
|
||||||
|
self.camera = gp.Camera() # type: ignore
|
||||||
|
self.camera.init()
|
||||||
|
self.running = True
|
||||||
|
self._capture_loop()
|
||||||
|
except gp.GPhoto2Error as e:
|
||||||
|
self.errorOccurred.emit(f"Błąd inicjalizacji kamery: {e}")
|
||||||
|
|
||||||
|
def stop_camera(self):
|
||||||
|
"""Zatrzymaj pobieranie"""
|
||||||
|
self.running = False
|
||||||
|
if self.camera:
|
||||||
|
try:
|
||||||
|
self.camera.exit()
|
||||||
|
except gp.GPhoto2Error:
|
||||||
|
pass
|
||||||
|
self.camera = None
|
||||||
|
|
||||||
|
def _capture_loop(self):
|
||||||
|
"""Pętla odczytu klatek w osobnym wątku"""
|
||||||
|
import time
|
||||||
|
delay = 1.0 / self.fps
|
||||||
|
|
||||||
|
while self.running:
|
||||||
|
try:
|
||||||
|
file = self.camera.capture_preview() # type: ignore
|
||||||
|
data = file.get_data_and_size()
|
||||||
|
frame = np.frombuffer(data, dtype=np.uint8)
|
||||||
|
frame = cv2.imdecode(frame, cv2.IMREAD_COLOR)
|
||||||
|
|
||||||
|
if frame is not None:
|
||||||
|
rgb_image = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
|
||||||
|
h, w, ch = rgb_image.shape
|
||||||
|
qimg = QImage(rgb_image.data, w, h, ch * w, QImage.Format.Format_RGB888)
|
||||||
|
pixmap = QPixmap.fromImage(qimg)
|
||||||
|
self.frameReady.emit(pixmap)
|
||||||
|
|
||||||
|
except gp.GPhoto2Error as e:
|
||||||
|
self.errorOccurred.emit(f"Błąd odczytu LiveView: {e}")
|
||||||
|
break
|
||||||
|
except Exception as e:
|
||||||
|
self.errorOccurred.emit(f"Nieoczekiwany błąd: {e}")
|
||||||
|
break
|
||||||
|
|
||||||
|
time.sleep(delay)
|
||||||
|
|
||||||
|
|
||||||
|
class CameraController(QObject):
|
||||||
|
frameReady = Signal(QPixmap)
|
||||||
|
errorOccurred = Signal(str)
|
||||||
|
|
||||||
|
def __init__(self, fps: int = 15, parent=None):
|
||||||
|
super().__init__(parent)
|
||||||
|
self.camera_thread = QThread()
|
||||||
|
self.worker = CameraWorker(fps)
|
||||||
|
self.worker.moveToThread(self.camera_thread )
|
||||||
|
|
||||||
|
# sygnały z workera
|
||||||
|
self.worker.frameReady.connect(self.frameReady)
|
||||||
|
self.worker.errorOccurred.connect(self.errorOccurred)
|
||||||
|
|
||||||
|
# sygnały start/stop
|
||||||
|
self.camera_thread.started.connect(self.worker.start_camera)
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
"""Start kamery w osobnym wątku"""
|
||||||
|
self.camera_thread.start()
|
||||||
|
|
||||||
|
def stop(self):
|
||||||
|
"""Stop kamery i zakończenie wątku"""
|
||||||
|
self.worker.stop_camera()
|
||||||
|
self.camera_thread.quit()
|
||||||
|
self.camera_thread.wait()
|
||||||
@@ -1,53 +1,100 @@
|
|||||||
|
from PySide6.QtWidgets import QPushButton
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from core.database import DatabaseManager
|
from core.database import DatabaseManager
|
||||||
from core.media import MediaRepository
|
from core.media import MediaRepository
|
||||||
from ui.widgets.color_list_widget import ColorListWidget
|
from ui.widgets.color_list_widget import ColorListWidget
|
||||||
from ui.widgets.thumbnail_list_widget import ThumbnailListWidget
|
from ui.widgets.thumbnail_list_widget import ThumbnailListWidget
|
||||||
|
from ui.widgets.split_view_widget import SplitView
|
||||||
|
# from .camera_controller import CameraController
|
||||||
|
from core.camera.camera_controller import CameraController
|
||||||
|
from core.camera.camera_manager import CameraManager
|
||||||
|
|
||||||
|
|
||||||
|
from core.camera.gphoto_camera import GPhotoCamera
|
||||||
|
from core.camera.camera_controller import CameraController
|
||||||
|
|
||||||
class MainController:
|
class MainController:
|
||||||
def __init__(self, view):
|
def __init__(self, view):
|
||||||
self.db = DatabaseManager()
|
self.db = DatabaseManager()
|
||||||
self.db.connect()
|
self.db.connect()
|
||||||
self.media_repo = MediaRepository(self.db)
|
self.media_repo = MediaRepository(self.db)
|
||||||
self.media_repo.sync_media()
|
self.media_repo.sync_media()
|
||||||
|
|
||||||
self.view = view
|
# camera = GPhotoCamera()
|
||||||
self.color_list: ColorListWidget = view.color_list_widget
|
# self.manager = CameraController(camera)
|
||||||
self.thumbnail_list: ThumbnailListWidget = view.thumbnail_widget
|
manager = CameraManager()
|
||||||
|
manager.detect_gphoto()
|
||||||
|
manager.detect_opencv()
|
||||||
|
|
||||||
|
# self.camera_controller = CameraController()
|
||||||
|
|
||||||
|
self.view = view
|
||||||
|
self.color_list: ColorListWidget = view.color_list_widget
|
||||||
|
self.thumbnail_list: ThumbnailListWidget = view.thumbnail_widget
|
||||||
|
self.split_view: SplitView = view.preview_widget
|
||||||
|
|
||||||
|
self.photo_button: QPushButton = view.photo_button
|
||||||
|
self.photo_button.clicked.connect(self.take_photo)
|
||||||
|
|
||||||
|
self.record_button: QPushButton = view.record_button
|
||||||
|
# self.record_button.clicked.connect(self.fun_test)
|
||||||
|
|
||||||
|
self.color_list.colorSelected.connect(self.on_color_selected)
|
||||||
|
self.color_list.editColor.connect(self.on_edit_color)
|
||||||
|
self.thumbnail_list.selectedThumbnail.connect(self.on_thumbnail_selected)
|
||||||
|
|
||||||
|
# self.camera_controller.errorOccurred.connect(self.split_view.widget_start.set_info_text)
|
||||||
|
# self.manager.error_occurred.connect(self.split_view.widget_start.set_info_text)
|
||||||
|
# self.camera_controller.frameReady.connect(self.split_view.set_live_image)
|
||||||
|
# self.manager.frame_ready.connect(self.split_view.set_live_image)
|
||||||
|
# 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.color_list.colorSelected.connect(self.on_color_selected)
|
def start_camera(self):
|
||||||
self.color_list.editColor.connect(self.on_edit_color)
|
pass
|
||||||
self.thumbnail_list.selectedThumbnail.connect(self.on_thumbnail_selected)
|
|
||||||
|
|
||||||
def load_colors(self) -> None:
|
def load_colors(self) -> None:
|
||||||
colors = self.db.get_all_colors()
|
colors = self.db.get_all_colors()
|
||||||
print("Loaded colors:", colors)
|
print("Loaded colors:", colors)
|
||||||
self.color_list.set_colors(colors)
|
self.color_list.set_colors(colors)
|
||||||
|
|
||||||
|
|
||||||
def on_color_selected(self, color_name: str):
|
def on_color_selected(self, color_name: str):
|
||||||
print(f"Wybrano kolor: {color_name}")
|
print(f"Wybrano kolor: {color_name}")
|
||||||
color_id = self.db.get_color_id(color_name)
|
color_id = self.db.get_color_id(color_name)
|
||||||
if color_id is not None:
|
if color_id is not None:
|
||||||
media_items = self.db.get_media_for_color(color_id)
|
media_items = self.db.get_media_for_color(color_id)
|
||||||
print(f"Media dla koloru {color_name} (ID: {color_id}):", media_items)
|
print(f"Media dla koloru {color_name} (ID: {color_id}):", media_items)
|
||||||
|
|
||||||
self.thumbnail_list.list_widget.clear()
|
self.thumbnail_list.list_widget.clear()
|
||||||
for media in media_items:
|
for media in media_items:
|
||||||
if media['file_type'] == 'photo':
|
if media['file_type'] == 'photo':
|
||||||
file_name = Path(media['media_path']).name
|
file_name = Path(media['media_path']).name
|
||||||
self.thumbnail_list.add_thumbnail(media['media_path'], file_name, media['id'])
|
self.thumbnail_list.add_thumbnail(media['media_path'], file_name, media['id'])
|
||||||
else:
|
else:
|
||||||
print(f"Nie znaleziono koloru o nazwie: {color_name}")
|
print(f"Nie znaleziono koloru o nazwie: {color_name}")
|
||||||
|
|
||||||
def on_edit_color(self, color_name: str):
|
def on_edit_color(self, color_name: str):
|
||||||
print(f"Edycja koloru: {color_name}")
|
print(f"Edycja koloru: {color_name}")
|
||||||
|
|
||||||
def on_thumbnail_selected(self, media_id: int):
|
def on_thumbnail_selected(self, media_id: int):
|
||||||
media = self.db.get_media(media_id)
|
media = self.db.get_media(media_id)
|
||||||
if media:
|
if media:
|
||||||
print(f"Wybrano miniaturę o ID: {media_id}, ścieżka: {media['media_path']}")
|
print(f"Wybrano miniaturę o ID: {media_id}, ścieżka: {media['media_path']}")
|
||||||
else:
|
self.split_view.set_reference_image(media['media_path'])
|
||||||
print(f"Nie znaleziono mediów o ID: {media_id}")
|
else:
|
||||||
|
print(f"Nie znaleziono mediów o ID: {media_id}")
|
||||||
|
|
||||||
|
def take_photo(self):
|
||||||
|
print("Robienie zdjęcia...")
|
||||||
|
self.split_view.toglle_live_view()
|
||||||
|
|
||||||
|
def start_liveview(self):
|
||||||
|
pass
|
||||||
|
# self.manager.start_camera()
|
||||||
|
# self.manager.start_stream()
|
||||||
|
|
||||||
|
def shutdown(self):
|
||||||
|
pass
|
||||||
|
# self.manager.stop()
|
||||||
148
controllers/mock_gphoto.py
Normal file
148
controllers/mock_gphoto.py
Normal file
@@ -0,0 +1,148 @@
|
|||||||
|
import cv2
|
||||||
|
import numpy as np
|
||||||
|
|
||||||
|
GP_WIDGET_WINDOW = 0
|
||||||
|
GP_WIDGET_SECTION = 0
|
||||||
|
GP_WIDGET_TEXT = 0
|
||||||
|
GP_WIDGET_RANGE = 0
|
||||||
|
GP_WIDGET_TOGGLE = 0
|
||||||
|
GP_WIDGET_RADIO = 0
|
||||||
|
GP_WIDGET_MENU = 0
|
||||||
|
GP_WIDGET_BUTTON = 0
|
||||||
|
GP_WIDGET_DATE = 0
|
||||||
|
|
||||||
|
class GPhoto2Error(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class CameraFileMock:
|
||||||
|
"""Mock obiektu zwracanego przez gphoto2.Camera.capture_preview()"""
|
||||||
|
|
||||||
|
def __init__(self, frame: np.ndarray):
|
||||||
|
# Kodowanie do JPEG, żeby symulować prawdziwe dane z kamery
|
||||||
|
success, buf = cv2.imencode(".jpg", frame)
|
||||||
|
if not success:
|
||||||
|
raise GPhoto2Error("Nie udało się zakodować ramki testowej.")
|
||||||
|
self._data = buf.tobytes()
|
||||||
|
|
||||||
|
def get_data_and_size(self):
|
||||||
|
return self._data
|
||||||
|
return self._data, len(self._data)
|
||||||
|
|
||||||
|
class CameraListMock:
|
||||||
|
def count(self):
|
||||||
|
return 1
|
||||||
|
|
||||||
|
def get_name(self, idx):
|
||||||
|
return f"mock_name {idx}"
|
||||||
|
|
||||||
|
def get_value(self, idx):
|
||||||
|
return f"mock_value {idx}"
|
||||||
|
|
||||||
|
class MockPortInfo:
|
||||||
|
def __init__(self, address):
|
||||||
|
self.address = address
|
||||||
|
|
||||||
|
class PortInfoList:
|
||||||
|
def __init__(self):
|
||||||
|
self._ports = []
|
||||||
|
|
||||||
|
def load(self):
|
||||||
|
# Dodaj przykładowe porty
|
||||||
|
self._ports = [MockPortInfo("usb:001,002"), MockPortInfo("usb:001,003")]
|
||||||
|
|
||||||
|
def lookup_path(self, port_address):
|
||||||
|
for idx, port in enumerate(self._ports):
|
||||||
|
if port.address == port_address:
|
||||||
|
return idx
|
||||||
|
raise ValueError("Port not found")
|
||||||
|
|
||||||
|
def __getitem__(self, idx):
|
||||||
|
return self._ports[idx]
|
||||||
|
|
||||||
|
class ConfigMock:
|
||||||
|
def get_id(self):
|
||||||
|
return 0
|
||||||
|
def get_name(self):
|
||||||
|
return "name"
|
||||||
|
def get_label(self):
|
||||||
|
return "label"
|
||||||
|
def get_type(self):
|
||||||
|
return 0
|
||||||
|
def get_value(self):
|
||||||
|
return "value"
|
||||||
|
def get_choices(self):
|
||||||
|
return []
|
||||||
|
def count_children(self):
|
||||||
|
return 0
|
||||||
|
def get_child(self):
|
||||||
|
return ConfigMock()
|
||||||
|
|
||||||
|
|
||||||
|
class CameraAbilitiesList:
|
||||||
|
def __init__(self) -> None:
|
||||||
|
self.abilities = []
|
||||||
|
def load(self):
|
||||||
|
return
|
||||||
|
def lookup_model(self, name):
|
||||||
|
return 1
|
||||||
|
def get_abilities(self, abilities_index):
|
||||||
|
return 0
|
||||||
|
|
||||||
|
class Camera:
|
||||||
|
def __init__(self):
|
||||||
|
self._frame_counter = 0
|
||||||
|
self._running = False
|
||||||
|
|
||||||
|
def init(self):
|
||||||
|
self._running = True
|
||||||
|
print("[my_gphoto] Kamera MOCK zainicjalizowana")
|
||||||
|
|
||||||
|
def exit(self):
|
||||||
|
self._running = False
|
||||||
|
print("[my_gphoto] Kamera MOCK wyłączona")
|
||||||
|
|
||||||
|
def capture_preview(self):
|
||||||
|
if not self._running:
|
||||||
|
raise GPhoto2Error("Kamera MOCK nie jest uruchomiona")
|
||||||
|
|
||||||
|
# przykład 1: wczytaj stały obrazek z pliku
|
||||||
|
# frame = cv2.imread("test_frame.jpg")
|
||||||
|
# if frame is None:
|
||||||
|
# raise GPhoto2Error("Nie znaleziono test_frame.jpg")
|
||||||
|
|
||||||
|
# przykład 2: wygeneruj kolorową planszę
|
||||||
|
h, w = 480, 640
|
||||||
|
color = (self._frame_counter % 255, 100, 200)
|
||||||
|
frame = np.full((h, w, 3), color, dtype=np.uint8)
|
||||||
|
|
||||||
|
# dodanie napisu
|
||||||
|
text = "OBRAZ TESTOWY"
|
||||||
|
font = cv2.FONT_HERSHEY_SIMPLEX
|
||||||
|
scale = 1.5
|
||||||
|
thickness = 3
|
||||||
|
color_text = (255, 255, 255)
|
||||||
|
|
||||||
|
(text_w, text_h), _ = cv2.getTextSize(text, font, scale, thickness)
|
||||||
|
x = (w - text_w) // 2
|
||||||
|
y = (h + text_h) // 2
|
||||||
|
cv2.putText(frame, text, (x, y), font, scale, color_text, thickness, cv2.LINE_AA)
|
||||||
|
|
||||||
|
|
||||||
|
self._frame_counter += 1
|
||||||
|
return CameraFileMock(frame)
|
||||||
|
|
||||||
|
def set_port_info(self, obj):
|
||||||
|
return False
|
||||||
|
|
||||||
|
def get_config(self):
|
||||||
|
return ConfigMock()
|
||||||
|
|
||||||
|
def set_single_config(self, name, widget):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def gp_camera_autodetect():
|
||||||
|
return CameraListMock()
|
||||||
|
|
||||||
|
def check_result(obj):
|
||||||
|
return obj
|
||||||
42
core/camera/base_camera.py
Normal file
42
core/camera/base_camera.py
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
from abc import ABC, abstractmethod
|
||||||
|
|
||||||
|
|
||||||
|
class BaseCamera(ABC):
|
||||||
|
def __init__(self) -> None:
|
||||||
|
self.error_msg = None
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
@abstractmethod
|
||||||
|
def detect() -> dict:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def connect(self, index: int | None = None) -> bool:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def disconnect(self) -> None:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_frame(self):
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_config_by_id(self, id: int) -> dict:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def get_config_by_name(self, name: str) -> dict:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def set_config_by_id(self, id: int, value) -> None:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@abstractmethod
|
||||||
|
def set_config_by_name(self, name: str, value) -> None:
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
def get_error_msg(self):
|
||||||
|
return str(self.error_msg)
|
||||||
115
core/camera/camera_controller.py
Normal file
115
core/camera/camera_controller.py
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
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 CameraController(QThread):
|
||||||
|
frame_ready = Signal(QPixmap)
|
||||||
|
photo_ready = Signal(QPixmap)
|
||||||
|
error_occurred = Signal(str)
|
||||||
|
_enable_timer = Signal(bool)
|
||||||
|
|
||||||
|
|
||||||
|
def __init__(self, parent: QObject | None = None) -> None:
|
||||||
|
super().__init__(parent)
|
||||||
|
self.camera = None
|
||||||
|
self.timer = None
|
||||||
|
self.fps = 15
|
||||||
|
self.is_streaming = False
|
||||||
|
self.is_connected = False
|
||||||
|
|
||||||
|
self._camera_mutex = QMutex()
|
||||||
|
self.start()
|
||||||
|
|
||||||
|
|
||||||
|
def run(self) -> None:
|
||||||
|
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.camera is None or self.is_connected:
|
||||||
|
return
|
||||||
|
|
||||||
|
if self.camera.connect():
|
||||||
|
self.is_connected = True
|
||||||
|
else:
|
||||||
|
self.is_connected = False
|
||||||
|
self.error_occurred.emit(self.camera.get_error_msg())
|
||||||
|
|
||||||
|
def stop_camera(self) -> None:
|
||||||
|
if self.is_streaming:
|
||||||
|
self.stop_stream()
|
||||||
|
|
||||||
|
if self.camera is not None:
|
||||||
|
self.camera.disconnect()
|
||||||
|
|
||||||
|
self.is_connected = False
|
||||||
|
|
||||||
|
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._enable_timer.emit(True)
|
||||||
|
|
||||||
|
def stop_stream(self) -> None:
|
||||||
|
if self.is_streaming:
|
||||||
|
self.is_streaming = False
|
||||||
|
if self.timer:
|
||||||
|
# self.timer.stop()
|
||||||
|
self._enable_timer.emit(False)
|
||||||
|
|
||||||
|
def _update_frame(self) -> None:
|
||||||
|
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()
|
||||||
|
|
||||||
|
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)
|
||||||
|
h, w, ch = rgb_image.shape
|
||||||
|
qimg = QImage(rgb_image.data, w, h, ch * w, QImage.Format.Format_RGB888)
|
||||||
|
pixmap = QPixmap.fromImage(qimg)
|
||||||
|
|
||||||
|
self.frame_ready.emit(pixmap)
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
||||||
20
core/camera/camera_manager.py
Normal file
20
core/camera/camera_manager.py
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
|
||||||
|
|
||||||
|
from .gphoto_camera import GPhotoCamera
|
||||||
|
from .opencv_camera import OpenCvCamera
|
||||||
|
from .camera_controller import CameraController
|
||||||
|
|
||||||
|
|
||||||
|
class CameraManager:
|
||||||
|
def __init__(self) -> None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def detect_gphoto(self):
|
||||||
|
camera_list = GPhotoCamera.detect()
|
||||||
|
print(camera_list)
|
||||||
|
return camera_list
|
||||||
|
|
||||||
|
def detect_opencv(self):
|
||||||
|
camera_list = OpenCvCamera.detect()
|
||||||
|
print(camera_list)
|
||||||
|
return camera_list
|
||||||
173
core/camera/gphoto_camera.py
Normal file
173
core/camera/gphoto_camera.py
Normal file
@@ -0,0 +1,173 @@
|
|||||||
|
from typing import Optional, List
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
import cv2
|
||||||
|
import numpy as np
|
||||||
|
|
||||||
|
from .base_camera import BaseCamera
|
||||||
|
|
||||||
|
try:
|
||||||
|
import gphoto2 as gp # type: ignore
|
||||||
|
except:
|
||||||
|
import controllers.mock_gphoto as gp
|
||||||
|
|
||||||
|
camera_widget_types = {
|
||||||
|
gp.GP_WIDGET_WINDOW: "GP_WIDGET_WINDOW", # type: ignore
|
||||||
|
gp.GP_WIDGET_SECTION: "GP_WIDGET_SECTION", # type: ignore
|
||||||
|
gp.GP_WIDGET_TEXT: "GP_WIDGET_TEXT", # type: ignore
|
||||||
|
gp.GP_WIDGET_RANGE: "GP_WIDGET_RANGE", # type: ignore
|
||||||
|
gp.GP_WIDGET_TOGGLE: "GP_WIDGET_TOGGLE", # type: ignore
|
||||||
|
gp.GP_WIDGET_RADIO: "GP_WIDGET_RADIO", # type: ignore
|
||||||
|
gp.GP_WIDGET_MENU: "GP_WIDGET_MENU", # type: ignore
|
||||||
|
gp.GP_WIDGET_BUTTON: "GP_WIDGET_BUTTON", # type: ignore
|
||||||
|
gp.GP_WIDGET_DATE: "GP_WIDGET_DATE", # type: ignore
|
||||||
|
}
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
("GP_OPERATION_NONE", gp.GP_OPERATION_NONE), # type: ignore
|
||||||
|
("GP_OPERATION_CAPTURE_IMAGE", gp.GP_OPERATION_CAPTURE_IMAGE), # type: ignore
|
||||||
|
("GP_OPERATION_CAPTURE_VIDEO", gp.GP_OPERATION_CAPTURE_VIDEO), # type: ignore
|
||||||
|
("GP_OPERATION_CAPTURE_AUDIO", gp.GP_OPERATION_CAPTURE_AUDIO), # type: ignore
|
||||||
|
("GP_OPERATION_CAPTURE_PREVIEW", gp.GP_OPERATION_CAPTURE_PREVIEW), # type: ignore
|
||||||
|
("GP_OPERATION_CONFIG", gp.GP_OPERATION_CONFIG), # type: ignore
|
||||||
|
("GP_OPERATION_TRIGGER_CAPTURE", gp.GP_OPERATION_TRIGGER_CAPTURE), # type: ignore
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class GPhotoCamera(BaseCamera):
|
||||||
|
def __init__(self) -> None:
|
||||||
|
super().__init__()
|
||||||
|
self.camera = None
|
||||||
|
self.configs: List[dict] = []
|
||||||
|
self.camera_index = 0
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def detect() -> dict:
|
||||||
|
cameras = gp.check_result(gp.gp_camera_autodetect()) # type: ignore
|
||||||
|
# cameras = gp.Camera().autodetect()
|
||||||
|
if not cameras or cameras.count() == 0: # type: ignore
|
||||||
|
return {}
|
||||||
|
|
||||||
|
abilities_list = gp.CameraAbilitiesList() # type: ignore
|
||||||
|
abilities_list.load()
|
||||||
|
camera_list = {}
|
||||||
|
for i in range(cameras.count()): # type: ignore
|
||||||
|
name = cameras.get_name(i) # type: ignore
|
||||||
|
port = cameras.get_value(i) # type: ignore
|
||||||
|
|
||||||
|
abilities_index = abilities_list.lookup_model(name)
|
||||||
|
abilities = abilities_list.get_abilities(abilities_index)
|
||||||
|
abilities_name = []
|
||||||
|
for name, bit in operations:
|
||||||
|
if abilities.operations & bit: # type: ignore
|
||||||
|
abilities_name.append(name)
|
||||||
|
|
||||||
|
camera_list[i] = {"name": name, "port": port, "abilities": abilities_name}
|
||||||
|
return camera_list
|
||||||
|
|
||||||
|
def connect(self, index: int | None = None) -> bool:
|
||||||
|
self.error_msg = None
|
||||||
|
self.camera = gp.Camera() # type: ignore
|
||||||
|
|
||||||
|
try:
|
||||||
|
if index:
|
||||||
|
self.camera_index = index
|
||||||
|
camera_list = GPhotoCamera.detect()
|
||||||
|
port_info_list = gp.PortInfoList()
|
||||||
|
port_info_list.load()
|
||||||
|
|
||||||
|
port_address = camera_list[index]["port"]
|
||||||
|
port_index = port_info_list.lookup_path(port_address)
|
||||||
|
|
||||||
|
self.camera.set_port_info(port_info_list[port_index])
|
||||||
|
|
||||||
|
self.camera.init()
|
||||||
|
config = self.camera.get_config()
|
||||||
|
self.read_config(config)
|
||||||
|
return True
|
||||||
|
except Exception as e:
|
||||||
|
self.error_msg = f"[GPHOTO2] {e}"
|
||||||
|
self.camera = None
|
||||||
|
return False
|
||||||
|
|
||||||
|
def disconnect(self) -> None:
|
||||||
|
if self.camera:
|
||||||
|
self.camera.exit()
|
||||||
|
self.camera = None
|
||||||
|
self.configs.clear()
|
||||||
|
|
||||||
|
def get_frame(self):
|
||||||
|
self.error_msg = None
|
||||||
|
|
||||||
|
if self.camera is None:
|
||||||
|
self.error_msg = "[GPHOTO2] Camera is not initialized."
|
||||||
|
return (False, None)
|
||||||
|
|
||||||
|
try:
|
||||||
|
file = self.camera.capture_preview() # type: ignore
|
||||||
|
data = file.get_data_and_size()
|
||||||
|
frame = np.frombuffer(data, dtype=np.uint8)
|
||||||
|
frame = cv2.imdecode(frame, cv2.IMREAD_COLOR)
|
||||||
|
|
||||||
|
return (True, frame)
|
||||||
|
except Exception as e:
|
||||||
|
self.error_msg = f"[GPHOTO2] {e}"
|
||||||
|
return (False, None)
|
||||||
|
|
||||||
|
def get_config_by_id(self, id: int):
|
||||||
|
return next(w for w in self.configs if w['id'] == id)
|
||||||
|
|
||||||
|
def get_config_by_name(self, name: str):
|
||||||
|
return next(w for w in self.configs if w['name'] == name)
|
||||||
|
|
||||||
|
def set_config(self, config, value):
|
||||||
|
if value not in config['choices']:
|
||||||
|
return
|
||||||
|
|
||||||
|
config['widget'].set_value(value) # type: ignore
|
||||||
|
if self._save_config(config):
|
||||||
|
config['value'] = value
|
||||||
|
|
||||||
|
def set_config_by_id(self, id: int, value: str):
|
||||||
|
config = self.get_config_by_id(id)
|
||||||
|
|
||||||
|
self.set_config(config, value)
|
||||||
|
|
||||||
|
def set_config_by_name(self, name: str, value: str):
|
||||||
|
config = self.get_config_by_name(name)
|
||||||
|
|
||||||
|
self.set_config(config, value)
|
||||||
|
|
||||||
|
def _save_config(self, config):
|
||||||
|
if not self.camera:
|
||||||
|
return False
|
||||||
|
|
||||||
|
self.camera.set_single_config(config['name'], config['widget'])
|
||||||
|
return True
|
||||||
|
|
||||||
|
def parse_config(self, config):
|
||||||
|
new_config = {
|
||||||
|
"id": config.get_id(),
|
||||||
|
"name": config.get_name(),
|
||||||
|
"label": config.get_label(),
|
||||||
|
"type": camera_widget_types[config.get_type()],
|
||||||
|
"widget": config
|
||||||
|
}
|
||||||
|
|
||||||
|
try:
|
||||||
|
new_config["value"] = config.get_value()
|
||||||
|
except gp.GPhoto2Error:
|
||||||
|
pass
|
||||||
|
|
||||||
|
try:
|
||||||
|
new_config["choices"] = list(config.get_choices())
|
||||||
|
except gp.GPhoto2Error:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return new_config
|
||||||
|
|
||||||
|
def read_config(self, config):
|
||||||
|
self.configs.append(self.parse_config(config))
|
||||||
|
|
||||||
|
for i in range(config.count_children()):
|
||||||
|
child = config.get_child(i)
|
||||||
|
self.read_config(child)
|
||||||
122
core/camera/opencv_camera.py
Normal file
122
core/camera/opencv_camera.py
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
import cv2
|
||||||
|
from cv2_enumerate_cameras import enumerate_cameras
|
||||||
|
from typing import List
|
||||||
|
|
||||||
|
from .base_camera import BaseCamera
|
||||||
|
|
||||||
|
|
||||||
|
class OpenCvCamera(BaseCamera):
|
||||||
|
"""Kamera oparta na cv2.VideoCapture"""
|
||||||
|
|
||||||
|
config_map = {
|
||||||
|
0: {"name": "frame_width", "cv_prop": cv2.CAP_PROP_FRAME_WIDTH, "default": 640},
|
||||||
|
1: {"name": "frame_height", "cv_prop": cv2.CAP_PROP_FRAME_HEIGHT, "default": 480},
|
||||||
|
2: {"name": "fps", "cv_prop": cv2.CAP_PROP_FPS, "default": 30},
|
||||||
|
3: {"name": "brightness", "cv_prop": cv2.CAP_PROP_BRIGHTNESS, "default": 0.5},
|
||||||
|
4: {"name": "contrast", "cv_prop": cv2.CAP_PROP_CONTRAST, "default": 0.5},
|
||||||
|
5: {"name": "saturation", "cv_prop": cv2.CAP_PROP_SATURATION, "default": 0.5},
|
||||||
|
}
|
||||||
|
|
||||||
|
def __init__(self) -> None:
|
||||||
|
super().__init__()
|
||||||
|
self.cap = None
|
||||||
|
self.configs: List[dict] = []
|
||||||
|
self.camera_list = []
|
||||||
|
self.camera_index = 0
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def detect():
|
||||||
|
camera_list = enumerate_cameras(cv2.CAP_ANY)
|
||||||
|
result = {}
|
||||||
|
|
||||||
|
for camera in camera_list:
|
||||||
|
cap = cv2.VideoCapture(camera.index, camera.backend)
|
||||||
|
# ret, frame = cap.read()
|
||||||
|
cap.release()
|
||||||
|
|
||||||
|
# if ret and frame is not None and frame.size > 0:
|
||||||
|
result[camera.index] = {
|
||||||
|
"name": camera.name,
|
||||||
|
"port": camera.path,
|
||||||
|
"backend": camera.backend,
|
||||||
|
}
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
def connect(self, index: int | None = None) -> bool:
|
||||||
|
self.error_msg = None
|
||||||
|
try:
|
||||||
|
if index:
|
||||||
|
self.camera_index = index
|
||||||
|
|
||||||
|
self.cap = cv2.VideoCapture(self.camera_index)
|
||||||
|
|
||||||
|
if not self.cap.isOpened():
|
||||||
|
self.error_msg = f"[CV2] Could not open camera {self.camera_index}"
|
||||||
|
return False
|
||||||
|
|
||||||
|
self.configs.clear()
|
||||||
|
for id, conf in self.config_map.items():
|
||||||
|
value = self.cap.get(conf["cv_prop"])
|
||||||
|
self.configs.append(
|
||||||
|
{
|
||||||
|
"id": id,
|
||||||
|
"name": conf["name"],
|
||||||
|
"label": conf["name"].capitalize(),
|
||||||
|
"value": value,
|
||||||
|
"choices": None, # brak predefiniowanych wyborów
|
||||||
|
"cv_prop": conf["cv_prop"],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
self.error_msg = f"[CV2] {e}"
|
||||||
|
self.cap = None
|
||||||
|
return False
|
||||||
|
|
||||||
|
def disconnect(self) -> None:
|
||||||
|
if self.cap:
|
||||||
|
self.cap.release()
|
||||||
|
self.cap = None
|
||||||
|
self.configs.clear()
|
||||||
|
|
||||||
|
def get_frame(self):
|
||||||
|
self.error_msg = None
|
||||||
|
if self.cap is None or not self.cap.isOpened():
|
||||||
|
self.error_msg = "[CV2] Camera is not initialized."
|
||||||
|
return (False, None)
|
||||||
|
|
||||||
|
try:
|
||||||
|
ret, frame = self.cap.read()
|
||||||
|
if not ret:
|
||||||
|
self.error_msg = "[CV2] Failed to read frame."
|
||||||
|
return (False, None)
|
||||||
|
return (True, frame)
|
||||||
|
except Exception as e:
|
||||||
|
self.error_msg = f"[CV2] {e}"
|
||||||
|
return (False, None)
|
||||||
|
|
||||||
|
def get_config_by_id(self, id: int):
|
||||||
|
return next(w for w in self.configs if w["id"] == id)
|
||||||
|
|
||||||
|
def get_config_by_name(self, name: str):
|
||||||
|
return next(w for w in self.configs if w["name"] == name)
|
||||||
|
|
||||||
|
def set_config(self, config, value: float):
|
||||||
|
if not self.cap:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
self.cap.set(config["cv_prop"], value)
|
||||||
|
config["value"] = self.cap.get(
|
||||||
|
config["cv_prop"]) # sprawdz co ustawiło
|
||||||
|
except Exception as e:
|
||||||
|
self.error_msg = f"[CV2] {e}"
|
||||||
|
|
||||||
|
def set_config_by_id(self, id: int, value: float):
|
||||||
|
config = self.get_config_by_id(id)
|
||||||
|
self.set_config(config, value)
|
||||||
|
|
||||||
|
def set_config_by_name(self, name: str, value: float):
|
||||||
|
config = self.get_config_by_name(name)
|
||||||
|
self.set_config(config, value)
|
||||||
5
main.py
5
main.py
@@ -1,6 +1,7 @@
|
|||||||
import sys
|
import sys
|
||||||
from PySide6.QtWidgets import QApplication
|
from PySide6.QtWidgets import QApplication
|
||||||
|
|
||||||
|
from ui.main_palette import set_dark_theme
|
||||||
from ui.main_window import MainWindow
|
from ui.main_window import MainWindow
|
||||||
from controllers.main_controller import MainController
|
from controllers.main_controller import MainController
|
||||||
|
|
||||||
@@ -8,9 +9,13 @@ from controllers.main_controller import MainController
|
|||||||
|
|
||||||
def main():
|
def main():
|
||||||
app = QApplication(sys.argv)
|
app = QApplication(sys.argv)
|
||||||
|
set_dark_theme(app)
|
||||||
|
# app.setStyle("Fusion")
|
||||||
window = MainWindow()
|
window = MainWindow()
|
||||||
controller = MainController(window)
|
controller = MainController(window)
|
||||||
controller.load_colors()
|
controller.load_colors()
|
||||||
|
|
||||||
|
app.aboutToQuit.connect(controller.shutdown)
|
||||||
window.show()
|
window.show()
|
||||||
sys.exit(app.exec())
|
sys.exit(app.exec())
|
||||||
|
|
||||||
|
|||||||
6
requirements.txt
Normal file
6
requirements.txt
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
numpy==2.2.6
|
||||||
|
opencv-python==4.12.0.88
|
||||||
|
PySide6==6.9.2
|
||||||
|
PySide6_Addons==6.9.2
|
||||||
|
PySide6_Essentials==6.9.2
|
||||||
|
shiboken6==6.9.2
|
||||||
48
ui/main_palette.py
Normal file
48
ui/main_palette.py
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
import sys
|
||||||
|
from PySide6.QtWidgets import QApplication
|
||||||
|
from PySide6.QtGui import QPalette, QColor
|
||||||
|
from PySide6.QtCore import Qt
|
||||||
|
|
||||||
|
def set_dark_theme(app: QApplication):
|
||||||
|
"""Definiuje i stosuje ciemną paletę kolorów do aplikacji."""
|
||||||
|
|
||||||
|
# 1. Upewnij się, że styl jest ustawiony na "Fusion"
|
||||||
|
app.setStyle('Fusion')
|
||||||
|
|
||||||
|
# 2. Definicja kolorów dla ciemnego motywu
|
||||||
|
palette = QPalette()
|
||||||
|
|
||||||
|
# Kolory tła
|
||||||
|
DARK_GRAY = QColor(45, 45, 45) # Ogólne tło okien i widżetów (Base, Window)
|
||||||
|
LIGHT_GRAY = QColor(53, 53, 53) # Tło elementów, np. toolbara, menu (Window)
|
||||||
|
VERY_DARK_GRAY = QColor(32, 32, 32) # Kolor tła dla kontrolek (Button)
|
||||||
|
|
||||||
|
# Kolory tekstu i obramowań
|
||||||
|
WHITE = QColor(200, 200, 200) # Główny kolor tekstu (Text, WindowText)
|
||||||
|
HIGHLIGHT = QColor(66, 135, 245) # Kolor podświetlenia (Highlight)
|
||||||
|
|
||||||
|
# Ustawienie głównej palety
|
||||||
|
# palette.setColor(QPalette.ColorRole.Window, LIGHT_GRAY)
|
||||||
|
palette.setColor(QPalette.ColorRole.Window, VERY_DARK_GRAY)
|
||||||
|
palette.setColor(QPalette.ColorRole.WindowText, WHITE)
|
||||||
|
palette.setColor(QPalette.ColorRole.Base, DARK_GRAY)
|
||||||
|
palette.setColor(QPalette.ColorRole.AlternateBase, LIGHT_GRAY)
|
||||||
|
palette.setColor(QPalette.ColorRole.ToolTipBase, WHITE)
|
||||||
|
palette.setColor(QPalette.ColorRole.ToolTipText, WHITE)
|
||||||
|
palette.setColor(QPalette.ColorRole.Text, WHITE)
|
||||||
|
palette.setColor(QPalette.ColorRole.Button, VERY_DARK_GRAY)
|
||||||
|
palette.setColor(QPalette.ColorRole.ButtonText, WHITE)
|
||||||
|
palette.setColor(QPalette.ColorRole.BrightText, Qt.GlobalColor.red)
|
||||||
|
palette.setColor(QPalette.ColorRole.Link, QColor(42, 130, 218))
|
||||||
|
palette.setColor(QPalette.ColorRole.PlaceholderText, QColor(150, 150, 150))
|
||||||
|
|
||||||
|
# Kolory zaznaczenia/interakcji
|
||||||
|
palette.setColor(QPalette.ColorRole.Highlight, HIGHLIGHT)
|
||||||
|
palette.setColor(QPalette.ColorRole.HighlightedText, Qt.GlobalColor.black)
|
||||||
|
|
||||||
|
# Kontrolki wyłączone (Disabled)
|
||||||
|
# palette.setColor(QPalette.ColorRole.Disabled, QPalette.ColorGroup.Active, QPalette.ColorRole.Text, QColor(127, 127, 127))
|
||||||
|
# palette.setColor(QPalette.ColorRole.Disabled, QPalette.ColorGroup.Active, QPalette.ColorRole.ButtonText, QColor(127, 127, 127))
|
||||||
|
|
||||||
|
# 3. Zastosowanie palety do aplikacji
|
||||||
|
app.setPalette(palette)
|
||||||
@@ -9,6 +9,7 @@ from PySide6.QtGui import QPalette, QColor
|
|||||||
from ui.widgets.placeholder_widget import PlaceholderWidget
|
from ui.widgets.placeholder_widget import PlaceholderWidget
|
||||||
from ui.widgets.color_list_widget import ColorListWidget
|
from ui.widgets.color_list_widget import ColorListWidget
|
||||||
from ui.widgets.thumbnail_list_widget import ThumbnailListWidget
|
from ui.widgets.thumbnail_list_widget import ThumbnailListWidget
|
||||||
|
from ui.widgets.split_view_widget import SplitView
|
||||||
|
|
||||||
class MainWindow(QMainWindow):
|
class MainWindow(QMainWindow):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
@@ -23,9 +24,7 @@ class MainWindow(QMainWindow):
|
|||||||
main_layout = QHBoxLayout(central_widget)
|
main_layout = QHBoxLayout(central_widget)
|
||||||
self.setCentralWidget(central_widget)
|
self.setCentralWidget(central_widget)
|
||||||
|
|
||||||
self.preview_widget = QSplitter(Qt.Orientation.Vertical)
|
self.preview_widget = SplitView()
|
||||||
self.preview_widget.addWidget(PlaceholderWidget("Camera View", "#750466"))
|
|
||||||
self.preview_widget.addWidget(PlaceholderWidget("Image View", "#007981"))
|
|
||||||
|
|
||||||
self.thumbnail_widget = ThumbnailListWidget()
|
self.thumbnail_widget = ThumbnailListWidget()
|
||||||
self.thumbnail_widget.setFixedWidth(200)
|
self.thumbnail_widget.setFixedWidth(200)
|
||||||
@@ -39,23 +38,24 @@ class MainWindow(QMainWindow):
|
|||||||
|
|
||||||
control_layout = QVBoxLayout(self.control_widget)
|
control_layout = QVBoxLayout(self.control_widget)
|
||||||
control_layout.setContentsMargins(0, 0, 0, 0)
|
control_layout.setContentsMargins(0, 0, 0, 0)
|
||||||
|
|
||||||
histogram_view = PlaceholderWidget("Histogram View", "#FF5733")
|
histogram_view = PlaceholderWidget("Histogram View", "#FF5733")
|
||||||
histogram_view.setFixedHeight(200)
|
histogram_view.setFixedHeight(200)
|
||||||
control_layout.addWidget(histogram_view)
|
|
||||||
|
|
||||||
self.color_list_widget = ColorListWidget(self.control_widget)
|
self.color_list_widget = ColorListWidget(self.control_widget)
|
||||||
|
|
||||||
|
self.record_button = QPushButton("Nagraj Wideo")
|
||||||
|
self.record_button.setMinimumHeight(40)
|
||||||
|
self.record_button.setStyleSheet("font-size: 12pt;")
|
||||||
|
|
||||||
|
self.photo_button = QPushButton("Zrób zdjęcie")
|
||||||
|
self.photo_button.setMinimumHeight(40)
|
||||||
|
self.photo_button.setStyleSheet("font-size: 12pt;")
|
||||||
|
|
||||||
|
control_layout.addWidget(histogram_view)
|
||||||
control_layout.addWidget(self.color_list_widget)
|
control_layout.addWidget(self.color_list_widget)
|
||||||
|
control_layout.addWidget(self.record_button)
|
||||||
record_button = QPushButton("Nagraj Wideo")
|
control_layout.addWidget(self.photo_button)
|
||||||
record_button.setMinimumHeight(40)
|
|
||||||
record_button.setStyleSheet("font-size: 12pt;")
|
|
||||||
control_layout.addWidget(record_button)
|
|
||||||
|
|
||||||
photo_button = QPushButton("Zrób zdjęcie")
|
|
||||||
photo_button.setMinimumHeight(40)
|
|
||||||
photo_button.setStyleSheet("font-size: 12pt;")
|
|
||||||
control_layout.addWidget(photo_button)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
164
ui/widgets/split_view_widget.py
Normal file
164
ui/widgets/split_view_widget.py
Normal file
@@ -0,0 +1,164 @@
|
|||||||
|
from PySide6.QtWidgets import QGraphicsView, QGraphicsScene, QGraphicsPixmapItem, QApplication, QMainWindow, QWidget, QVBoxLayout, QSplitter, QStackedWidget, QPushButton, QLabel
|
||||||
|
from PySide6.QtGui import QPixmap, QWheelEvent, QPainter, QBrush, QColor
|
||||||
|
from PySide6.QtCore import Qt
|
||||||
|
import sys
|
||||||
|
from ui.widgets.placeholder_widget import PlaceholderWidget
|
||||||
|
|
||||||
|
class ZoomableImageView(QGraphicsView):
|
||||||
|
def __init__(self, parent=None):
|
||||||
|
super().__init__(parent)
|
||||||
|
|
||||||
|
# Scena i element obrazu
|
||||||
|
self._scene = QGraphicsScene(self)
|
||||||
|
self.setScene(self._scene)
|
||||||
|
self._scene.setBackgroundBrush(QBrush(QColor(20, 20, 20))) # ciemne tło
|
||||||
|
|
||||||
|
self._pixmap_item = QGraphicsPixmapItem()
|
||||||
|
self._scene.addItem(self._pixmap_item)
|
||||||
|
|
||||||
|
# Ustawienia widoku
|
||||||
|
self.setDragMode(QGraphicsView.DragMode.ScrollHandDrag) # przesuwanie myszą
|
||||||
|
self.setRenderHint(QPainter.RenderHint.Antialiasing)
|
||||||
|
self.setRenderHint(QPainter.RenderHint.SmoothPixmapTransform)
|
||||||
|
|
||||||
|
# Wyłączenie suwaków
|
||||||
|
self.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
|
||||||
|
self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
|
||||||
|
# Parametry zoomu
|
||||||
|
self._zoom_factor = 1.25
|
||||||
|
self._current_scale = 1.0
|
||||||
|
|
||||||
|
def set_image(self, pixmap: QPixmap):
|
||||||
|
# pixmap = QPixmap(image_path)
|
||||||
|
self._pixmap_item.setPixmap(pixmap)
|
||||||
|
self._scene.setSceneRect(pixmap.rect())
|
||||||
|
# self.reset_transform()
|
||||||
|
|
||||||
|
def reset_transform(self):
|
||||||
|
"""Resetuje skalowanie i ustawia 1:1"""
|
||||||
|
self._current_scale = 1.0
|
||||||
|
self.setTransform(self.transform().fromScale(1, 1))
|
||||||
|
|
||||||
|
def wheelEvent(self, event: QWheelEvent):
|
||||||
|
"""Zoom kółkiem myszy"""
|
||||||
|
if event.modifiers() & Qt.KeyboardModifier.ControlModifier: # zoom tylko z CTRL
|
||||||
|
if event.angleDelta().y() > 0:
|
||||||
|
zoom = self._zoom_factor
|
||||||
|
else:
|
||||||
|
zoom = 1 / self._zoom_factor
|
||||||
|
|
||||||
|
self._current_scale *= zoom
|
||||||
|
self.scale(zoom, zoom)
|
||||||
|
else:
|
||||||
|
return
|
||||||
|
super().wheelEvent(event) # normalne przewijanie
|
||||||
|
|
||||||
|
class CameraPlaceholder(QWidget):
|
||||||
|
def __init__(self, parent=None):
|
||||||
|
super().__init__(parent)
|
||||||
|
|
||||||
|
self.setAutoFillBackground(True)
|
||||||
|
self.setStyleSheet("background-color: #141414;")
|
||||||
|
|
||||||
|
layout = QVBoxLayout(self)
|
||||||
|
layout.setSpacing(20)
|
||||||
|
|
||||||
|
self.camera_start_btn = QPushButton("Start Camera")
|
||||||
|
self.camera_start_btn.setFixedSize(200, 50)
|
||||||
|
style_sheet = """
|
||||||
|
QPushButton {
|
||||||
|
/* --- Styl podstawowy --- */
|
||||||
|
background-color: transparent;
|
||||||
|
border: 2px solid #CECECE; /* Grubość, styl i kolor obramowania */
|
||||||
|
border-radius: 25px; /* Kluczowa właściwość do zaokrąglenia rogów! */
|
||||||
|
color: #CECECE;
|
||||||
|
padding: 10px 20px; /* Wewnętrzny margines */
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
QPushButton:hover {
|
||||||
|
/* --- Styl po najechaniu myszką --- */
|
||||||
|
color: #F0F0F0;
|
||||||
|
border: 2px solid #F0F0F0;
|
||||||
|
}
|
||||||
|
|
||||||
|
QPushButton:pressed {
|
||||||
|
/* --- Styl po naciśnięciu --- */
|
||||||
|
background-color: #e0e0e0; /* Ciemniejsze tło w momencie kliknięcia */
|
||||||
|
border: 2px solid #e0e0e0; /* Zmiana koloru ramki dla sygnalizacji akcji */
|
||||||
|
}
|
||||||
|
"""
|
||||||
|
self.camera_start_btn.setStyleSheet(style_sheet)
|
||||||
|
|
||||||
|
self.info_label = QLabel("Kliknij, aby uruchomić kamerę")
|
||||||
|
self.info_label.setStyleSheet("background-color: transparent; color: #CECECE; font-size: 18px;")
|
||||||
|
self.info_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
|
|
||||||
|
layout.addStretch()
|
||||||
|
layout.addWidget(self.camera_start_btn, alignment=Qt.AlignmentFlag.AlignCenter)
|
||||||
|
layout.addWidget(self.info_label)
|
||||||
|
layout.addStretch()
|
||||||
|
self.setLayout(layout)
|
||||||
|
|
||||||
|
def set_info_text(self, text: str):
|
||||||
|
self.info_label.setText(text)
|
||||||
|
|
||||||
|
class SplitView(QSplitter):
|
||||||
|
def __init__(self, parent=None):
|
||||||
|
super().__init__(parent)
|
||||||
|
print("Inicjalizacja SplitView2")
|
||||||
|
self.setOrientation(Qt.Orientation.Vertical)
|
||||||
|
|
||||||
|
self.widget_start = CameraPlaceholder()
|
||||||
|
self.widget_live = ZoomableImageView()
|
||||||
|
# self.widget_live = PlaceholderWidget("Camera View", "#750466")
|
||||||
|
self.widget_ref = ZoomableImageView()
|
||||||
|
# self.widget_ref = PlaceholderWidget("Image View", "#007981")
|
||||||
|
|
||||||
|
self.stack = QStackedWidget()
|
||||||
|
self.stack.addWidget(self.widget_start)
|
||||||
|
self.stack.addWidget(self.widget_live)
|
||||||
|
self.stack.setCurrentWidget(self.widget_start)
|
||||||
|
|
||||||
|
self.addWidget(self.stack)
|
||||||
|
self.addWidget(self.widget_ref)
|
||||||
|
|
||||||
|
self.setSizes([self.height(), 0])
|
||||||
|
|
||||||
|
pixmap = QPixmap("media/empty_guitar_h.jpg")
|
||||||
|
# pixmap.fill(Qt.GlobalColor.lightGray)
|
||||||
|
self.widget_live.set_image(pixmap)
|
||||||
|
|
||||||
|
def toggle_orientation(self):
|
||||||
|
if self.orientation() == Qt.Orientation.Vertical:
|
||||||
|
self.setOrientation(Qt.Orientation.Horizontal)
|
||||||
|
self.setSizes([self.width()//2, self.width()//2])
|
||||||
|
else:
|
||||||
|
self.setOrientation(Qt.Orientation.Vertical)
|
||||||
|
self.setSizes([self.height()//2, self.height()//2])
|
||||||
|
|
||||||
|
# def set_live_image(self, path_image: str):
|
||||||
|
# """Ustawienie obrazu na żywo"""
|
||||||
|
# pixmap = QPixmap(path_image)
|
||||||
|
# self.widget_live.set_image(pixmap)
|
||||||
|
|
||||||
|
def set_live_image(self, pixmap: QPixmap):
|
||||||
|
"""Ustawienie obrazu na żywo"""
|
||||||
|
self.widget_live.set_image(pixmap)
|
||||||
|
if self.stack.currentWidget() != self.widget_live:
|
||||||
|
self.stack.setCurrentWidget(self.widget_live)
|
||||||
|
|
||||||
|
def set_reference_image(self, path_image: str):
|
||||||
|
"""Ustawienie obrazu referencyjnego"""
|
||||||
|
pixmap = QPixmap(path_image)
|
||||||
|
self.widget_ref.set_image(pixmap)
|
||||||
|
|
||||||
|
def toglle_live_view(self):
|
||||||
|
"""Przełączanie widoku na żywo"""
|
||||||
|
if self.stack.currentWidget() == self.widget_start:
|
||||||
|
self.stack.setCurrentWidget(self.widget_live)
|
||||||
|
else:
|
||||||
|
self.stack.setCurrentWidget(self.widget_start)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user