temporary commit
This commit is contained in:
@@ -6,7 +6,8 @@ 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 .camera_controller import CameraController
|
||||
|
||||
from ..core.gphoto_adapter import GPhotoImageSource, GPhotoControlSource
|
||||
import gphoto2 as gp
|
||||
|
||||
class MainController:
|
||||
def __init__(self, view):
|
||||
@@ -15,7 +16,11 @@ class MainController:
|
||||
self.media_repo = MediaRepository(self.db)
|
||||
self.media_repo.sync_media()
|
||||
|
||||
self.camera_controller = CameraController()
|
||||
camera = gp.Camera()
|
||||
camera.init()
|
||||
stream = GPhotoImageSource(camera=camera, fps=15)
|
||||
controll = GPhotoControlSource(camera=camera)
|
||||
self.camera_controller = CameraController(stream, controll)
|
||||
|
||||
self.view = view
|
||||
self.color_list: ColorListWidget = view.color_list_widget
|
||||
@@ -30,7 +35,7 @@ class MainController:
|
||||
self.thumbnail_list.selectedThumbnail.connect(self.on_thumbnail_selected)
|
||||
|
||||
self.camera_controller.errorOccurred.connect(self.split_view.widget_start.set_info_text)
|
||||
self.camera_controller.frameReady.connect(self.split_view.set_live_image)
|
||||
self.camera_controller.new_frame.connect(self.split_view.set_live_image)
|
||||
self.split_view.widget_start.camera_start_btn.clicked.connect(self.camera_controller.start)
|
||||
|
||||
def start_camera(self):
|
||||
|
||||
Reference in New Issue
Block a user