Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

Jon/camera windows (#242)

jonmatthisbb4df0bf39d9
diff --git a/requirements.txt b/requirements.txt
index 7024a71a..8be9bbb6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ pandas==1.4.2
pyqtgraph==0.12.4
pyqt6==6.3.1
pyopengl==3.1.6
-mediapipe==0.8.9.1
+mediapipe==0.8.11
setuptools==58.0.4
aniposelib==0.4.3
rich==12.3.0
diff --git a/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py b/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
index 6af5ecdd..17791e48 100644
--- a/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
+++ b/src/cameras/capture/opencv_camera/camera_stream_thread_handler.py
@@ -64,18 +64,18 @@ class VideoCaptureThread(threading.Thread):
def _start_frame_loop(self):
self._is_capturing_frames = True
-
+ logger.info(f"Starting frame loop for {self._webcam_id}")
try:
while self._is_capturing_frames:
- start = time.perf_counter_ns()
self._frame = self._get_next_frame()
- self._elapsed_during_frame_grab.append(time.perf_counter_ns() - start)
self._timestamps_npy.append(
self._frame.timestamp_in_seconds_from_record_start
)
self._num_frames_processed += 1
- # logger.debug(f"Camera {self._webcam_id}: captured frame# {self._num_frames_processed}")
+ # logger.debug(
+ # f"Camera {self._webcam_id}: captured frame# {self._num_frames_processed}"
+ # )
except:
logger.error("Frame loop thread exited due to error")
traceback.print_exc()
diff --git a/src/cameras/capture/opencv_camera/opencv_camera.py b/src/cameras/capture/opencv_camera/opencv_camera.py
index 9b6667cb..42563c41 100644
--- a/src/cameras/capture/opencv_camera/opencv_camera.py
+++ b/src/cameras/capture/opencv_camera/opencv_camera.py
@@ -140,6 +140,12 @@ class OpenCVCamera:
)
self._opencv_video_capture_object.release()
+ if self._running_thread.is_capturing_frames:
+ logger.debug(
+ f"Stopping frame capture thread for Camera: {self._config.webcam_id}"
+ )
+ self._running_thread.stop()
+
def record_frames(self, save_frames_bool: bool):
self._running_thread.is_recording_frames = save_frames_bool
@@ -154,6 +160,7 @@ class OpenCVCamera:
self._running_thread.start()
def _create_thread(self):
+ logger.debug(f"Creating thread for webcam: {self.webcam_id_as_str}")
return VideoCaptureThread(
webcam_id=self.webcam_id_as_str,
get_next_frame=self.get_next_frame,
@@ -168,6 +175,18 @@ class OpenCVCamera:
f"Resolution height: {self._config.resolution_height}, "
f"Fourcc: {self._config.fourcc}"
)
+ try:
+ if not self._opencv_video_capture_object.isOpened():
+ logger.error(
+ f"Failed to apply configuration to Camera {self._config.webcam_id} - camera is not open"
+ )
+ return
+ except Exception as e:
+ logger.error(
+ f"Failed when trying to check if Camera {self._config.webcam_id} is open"
+ )
+ return
+
try:
self._opencv_video_capture_object.set(
cv2.CAP_PROP_EXPOSURE, self._config.exposure
diff --git a/src/export_stuff/blender_stuff/create_blend_file_from_session_data.py b/src/export_stuff/blender_stuff/create_blend_file_from_session_data.py
index 9bd53fe8..7cf39088 100644
--- a/src/export_stuff/blender_stuff/create_blend_file_from_session_data.py
+++ b/src/export_stuff/blender_stuff/create_blend_file_from_session_data.py
@@ -24,6 +24,16 @@ def create_blend_file_from_session_data(
path_to_this_py_file / "alpha_freemocap_blender_megascript.py"
)
+ try:
+ blender_exe_path = Path(blender_exe_path)
+ if not blender_exe_path.exists():
+ raise FileNotFoundError(
+ f"Could not find the blender executable at {blender_exe_path}"
+ )
+ except Exception as e:
+ logger.error(e)
+ return
+
command_str = (
str(blender_exe_path)
+ " --background"
diff --git a/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py b/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py
index 60824a62..3fd1ebb3 100644
--- a/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py
+++ b/src/export_stuff/blender_stuff/get_best_guess_of_blender_path.py
@@ -7,18 +7,22 @@ logger = logging.getLogger(__name__)
def get_best_guess_of_blender_path():
if platform.system() == "Windows":
- base_path = Path("C:\Program Files\Blender Foundation")
- blender_folder_path = [path for path in base_path.glob("Blender*")]
- blender_exe_path = blender_folder_path[0] / "blender.exe"
- logger.info(
- f"Windows machine detected - guessing that `blender` is installed at: {str(blender_exe_path)}"
- )
+ try:
+ base_path = Path("C:\Program Files\Blender Foundation")
+ blender_folder_path = [path for path in base_path.glob("Blender*")]
+ blender_exe_path = blender_folder_path[0] / "blender.exe"
+ logger.info(
+ f"Windows machine detected - guessing that `blender` is installed at: {str(blender_exe_path)}"
+ )
- if blender_exe_path.is_file():
- return str(blender_exe_path)
- else:
- return None
+ if blender_exe_path.is_file():
+ return str(blender_exe_path)
+ except Exception as e:
+ print(e)
+ logger.warning("Couldn't find Blender path automatically, need to select it manually")
+
+ return None
else:
- logger.info(f"Non-Windows machine detected - TO DO - This, lol")
+ logger.info(f"Non-Windows machine detected - TODO - This, lol")
return None
diff --git a/src/gui/main/app.py b/src/gui/main/app.py
index 26ec678c..57a65aae 100644
--- a/src/gui/main/app.py
+++ b/src/gui/main/app.py
@@ -1,9 +1,10 @@
+from PyQt6.QtWidgets import QApplication
from pyqtgraph import mkQApp
APP = None
-def get_qt_app():
+def get_qt_app()->QApplication:
global APP
if APP is None:
APP = mkQApp()
diff --git a/src/gui/main/custom_widgets/single_camera_widget.py b/src/gui/main/custom_widgets/single_camera_widget.py
index 04e7a272..24ebad6e 100644
--- a/src/gui/main/custom_widgets/single_camera_widget.py
+++ b/src/gui/main/custom_widgets/single_camera_widget.py
@@ -3,7 +3,7 @@ import enum
from PyQt6 import QtGui
from PyQt6.QtCore import pyqtSignal, Qt
from PyQt6.QtGui import QPixmap
-from PyQt6.QtWidgets import QHBoxLayout, QWidget, QLabel
+from PyQt6.QtWidgets import QHBoxLayout, QWidget, QLabel, QFrame, QVBoxLayout
from src.config.webcam_config import WebcamConfig
from src.gui.main.workers.cam_charuco_frame_thread_worker import (
@@ -37,13 +37,20 @@ class SingleCameraWidget(QWidget):
def __init__(self, webcam_config: WebcamConfig):
super().__init__()
self._webcam_config = webcam_config
- self._video = QLabel()
- # self._video.setScaledContents(True)
- layout = QHBoxLayout()
- layout.addWidget(self._video)
+ layout = QVBoxLayout()
self.setLayout(layout)
+ self._camera_name_str = f"Camera {self._webcam_config.webcam_id}"
+ layout.addWidget(QLabel(self._camera_name_str))
+
+ self._video_label = QLabel()
+ self._video_label.setFrameStyle((QFrame.Panel | QFrame.Plain))
+ self._video_label.setLineWidth(3)
+ # self._video.setScaledContents(True)
+
+ layout.addWidget(self._video_label)
+
@property
def should_record_frames(self):
return self._worker.should_save_frames
@@ -78,18 +85,32 @@ class SingleCameraWidget(QWidget):
worker.image_updated_signal.connect(self._handle_image_update)
return worker
- def _handle_image_update(self, image):
- self._pixmap = QPixmap.fromImage(image)
- self._video.setPixmap(self._pixmap)
+ def _handle_image_update(self, q_image):
+ self._pixmap = QPixmap.fromImage(q_image)
+
+ if (
+ self._video_label.width() < self._webcam_config.resolution_width
+ or self._video_label.height() < self._webcam_config.resolution_height
+ ):
+ scaled_width = self._video_label.width()
+ scaled_height = self._video_label.height()
+ else:
+ scaled_width = self._webcam_config.resolution_width
+ scaled_height = self._webcam_config.resolution_height
+
+ self._pixmap = self._pixmap.scaled(
+ scaled_width,
+ scaled_height,
+ Qt.KeepAspectRatio,
+ Qt.SmoothTransformation,
+ )
- def resizeEvent(self, a0: QtGui.QResizeEvent) -> None:
- logging.info(f" Camera {self._webcam_config.webcam_id} window resized")
+ self._video_label.setPixmap(self._pixmap)
- # TO DO - Some kinda something here to make the videos scale properly and keep their aspect ratio
+ # def resizeEvent(self, a0: QtGui.QResizeEvent) -> None:
+ # logging.info(f" Camera {self._webcam_config.webcam_id} window resized")
- # self._pixmap.scaled(
- # self.width(), self.height(), Qt.KeepAspectRatio, Qt.SmoothTransformation
- # )
+ # TO DO - Some kinda something here to make the videos scale properly and keep their aspect ratio
def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
logging.info(f" Camera {self._webcam_config.webcam_id} window closed")
diff --git a/src/gui/main/main.py b/src/gui/main/main.py
index 85b48cd5..6af7c47b 100644
--- a/src/gui/main/main.py
+++ b/src/gui/main/main.py
@@ -5,35 +5,43 @@ import sys
from PyQt6.QtCore import QTimer
from PyQt6.QtWidgets import QApplication
+from pathlib import Path
+
+from src.gui.main.style_stuff.css_style_sheet import qt_app_css_style_sheet
+
+repo = Path(__file__).parent.parent.parent.parent
+sys.path.insert(0, str(repo))
+
from src.gui.main.app import get_qt_app
from src.gui.main.main_window.main_window import MainWindow, EXIT_CODE_REBOOT
logger = logging.getLogger(__name__)
-gui_loop_count = -1
+loop_count = -1
def sigint_handler(*args):
"""Handler for the SIGINT signal."""
QApplication.quit()
-
def log_gui_loop():
- global gui_loop_count
- gui_loop_count += 1
- if gui_loop_count % 10 == 0:
- logger.debug("GUI loop {}".format(gui_loop_count))
+ global loop_count
+ loop_count += 1
+ if loop_count % 10 == 0:
+ logger.debug("GUI loop {}".format(loop_count))
if __name__ == "__main__":
logger.info("Starting main...")
signal.signal(signal.SIGINT, sigint_handler)
app = get_qt_app()
- # timer = QTimer()
- # timer.start(500)
+ app.setStyleSheet(qt_app_css_style_sheet)
+ timer = QTimer()
+ timer.start(500)
# # timer.timeout.connect(log_gui_loop) # Let the interpreter run each 500 ms.
# timer.timeout.connect(lambda: None) # Let the interpreter run each 500 ms.
+
while True:
# rebootable GUI method based on this - https://stackoverflow.com/a/56563926/14662833
win = MainWindow()
diff --git a/src/gui/main/main_window/left_panel_controls/control_panel.py b/src/gui/main/main_window/left_panel_controls/control_panel.py
index 54e44b0e..e3ff3ff1 100644
--- a/src/gui/main/main_window/left_panel_controls/control_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/control_panel.py
@@ -64,12 +64,10 @@ class ControlPanel:
def calibrate_capture_volume_panel(self):
return self._dictionary_of_toolbox_panels["2 - Calibrate Capture Volume"]
-
@property
def record_motion_capture_videos_panel(self):
return self._dictionary_of_toolbox_panels[
"3 - Record and Process Motion Capture Videos"
-
]
@property
@@ -80,7 +78,6 @@ class ControlPanel:
def visualize_motion_capture_data_panel(self):
return self._dictionary_of_toolbox_panels["4 - Visualize Motion Capture Data"]
-
@property
def toolbox_widget(self):
return self._toolbox_widget
@@ -111,7 +108,6 @@ class ControlPanel:
] = RecordMotionCatpureVideosPanel()
dictionary_of_toolbox_panels[
"4 - Visualize Motion Capture Data"
-
] = VisualizeMotionCaptureDataPanel()
# self._process_session_data_panel = ProcessSessionDataPanel()
return dictionary_of_toolbox_panels
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
index e2238abb..17fbf792 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/calibrate_capture_volume_panel.py
@@ -53,8 +53,9 @@ class CalibrateCaptureVolumePanel(QWidget):
self._layout.addWidget(QLabel("Charuco Checkerboard Type:"))
self._charuco_board_definition = CharucoBoardDefinition()
self._charuco_combo_box = QComboBox()
- self._charuco_combo_box.addItem("Default (3x5 squares)")
self._charuco_combo_box.addItem("Pre-Alpha (5x7 squares)")
+ self._charuco_combo_box.addItem("Bigger Squares (3x5 squares)")
+
self._layout.addWidget(self._charuco_combo_box)
self._charuco_square_size_form_layout = QFormLayout()
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py
index b5515592..fa0d0755 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/camera_setup_control_panel.py
@@ -2,7 +2,14 @@ from typing import Dict
import cv2
from PyQt6.QtCore import pyqtSignal
-from PyQt6.QtWidgets import QVBoxLayout, QWidget, QPushButton, QTextEdit, QLabel
+from PyQt6.QtWidgets import (
+ QVBoxLayout,
+ QWidget,
+ QPushButton,
+ QTextEdit,
+ QLabel,
+ QHBoxLayout,
+)
from pyqtgraph.parametertree import ParameterTree, Parameter
from src.cameras.detection.models import FoundCamerasResponse
@@ -65,9 +72,16 @@ class CameraSetupControlPanel(QWidget):
self._apply_settings_to_cameras_button.setEnabled(True)
self._layout.addWidget(self._apply_settings_to_cameras_button)
+ self._pop_dock_buttons_layout = QHBoxLayout()
+ self._layout.addLayout(self._pop_dock_buttons_layout)
+
self._pop_out_cameras_button = QPushButton("Pop out cameras")
- self._pop_out_cameras_button.setEnabled(False)
- self._layout.addWidget(self._pop_out_cameras_button)
+ self._pop_out_cameras_button.setEnabled(True)
+ self._pop_dock_buttons_layout.addWidget(self._pop_out_cameras_button)
+
+ self._dock_cameras_button = QPushButton("Dock cameras")
+ self._dock_cameras_button.setEnabled(False)
+ self._pop_dock_buttons_layout.addWidget(self._dock_cameras_button)
self._close_cameras_button = QPushButton("Close cameras")
self._close_cameras_button.setEnabled(True)
@@ -90,6 +104,10 @@ class CameraSetupControlPanel(QWidget):
def pop_out_cameras_button(self):
return self._pop_out_cameras_button
+ @property
+ def dock_cameras_button(self):
+ return self._dock_cameras_button
+
@property
def close_cameras_button(self):
return self._close_cameras_button
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py
index b463e5ff..c4d20f86 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py
@@ -1,16 +1,9 @@
-from PyQt6.QtCore import Qt
from PyQt6.QtWidgets import (
QWidget,
QVBoxLayout,
- QLabel,
- QLineEdit,
- QFormLayout,
QPushButton,
)
-from src.config.home_dir import create_default_session_id
-from src.gui.main.styled_widgets.primary_button import PrimaryButton
-
class VisualizeMotionCaptureDataPanel(QWidget):
def __init__(self):
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
index 0ae490f3..7bde6433 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
@@ -1,20 +1,20 @@
import logging
from PyQt6 import QtCore
-from PyQt6.QtCore import Qt
from PyQt6.QtWidgets import (
QWidget,
QVBoxLayout,
QLabel,
QLineEdit,
QFormLayout,
-
- QPushButton, QCheckBox,
+ QPushButton,
+ QCheckBox,
)
from src.config.home_dir import create_default_session_id
-from src.gui.main.styled_widgets.page_title import PageTitle
-from src.gui.main.styled_widgets.primary_button import PrimaryButton
+from src.gui.main.style_stuff.css_style_sheet import recommended_next_button_style_sheet
+from src.gui.main.style_stuff.styled_widgets.page_title import PageTitle
+from src.gui.main.style_stuff.styled_widgets.primary_button import PrimaryButton
logger = logging.getLogger(__name__)
@@ -34,33 +34,31 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
self._layout.addLayout(self._create_get_session_id_form_layout())
- self._start_new_session_button = PrimaryButton("&Start New Session (Ctrl+N)")
+ self._start_new_session_button = QPushButton("&Start New Session (Ctrl+N)")
+ self._start_new_session_button.setStyleSheet(recommended_next_button_style_sheet)
self._layout.addWidget(self._start_new_session_button)
self._load_most_recent_session_button = QPushButton(
"Load Most &Recent Session (Ctrl+D)",
-
)
self._load_most_recent_session_button.setEnabled(True)
self._layout.addWidget(self._load_most_recent_session_button)
self._load_session_button = QPushButton(
"Load Session (Ctrl+O)",
-
)
self._load_session_button.setEnabled(True)
self._layout.addWidget(self._load_session_button)
- self._import_external_videos_button = QPushButton(
- "TO DO - Import External &Videos"
- )
- self._import_external_videos_button.setEnabled(False)
+ self._import_external_videos_button = QPushButton("Import External &Videos")
+ self._import_external_videos_button.setEnabled(True)
self._layout.addWidget(self._import_external_videos_button)
self._layout.addStretch()
-
- self._send_pings_checkbox = QCheckBox("Send ping to devs to let us know when you make a new session because that will help us get funding for this project :D ")
+ self._send_pings_checkbox = QCheckBox(
+ "Send ping to devs to let us know when you make a new session because that will help us get funding for this project :D "
+ )
self._send_pings_checkbox.setChecked(True)
self._layout.addWidget(self._send_pings_checkbox)
@@ -77,7 +75,10 @@ class WelcomeCreateOrLoadNewSessionPanel(QWidget):
return self._load_session_button
@property
+ def import_external_videos_button(self):
+ return self._import_external_videos_button
+ @property
def send_pings_checkbox(self):
return self._send_pings_checkbox
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_tab.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_tab.py
index 76074a30..e60cbc12 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_tab.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_tab.py
@@ -1,18 +1,9 @@
from PyQt6.QtWidgets import (
QWidget,
QVBoxLayout,
- QHBoxLayout,
- QLabel,
- QCheckBox,
- QLineEdit,
QPushButton,
)
-from src.config.home_dir import create_default_session_id
-from src.gui.icis_conference_main.shared_widgets.primary_button import PrimaryButton
-from src.gui.main.app_state.app_state import APP_STATE
-from src.gui.main.styled_widgets.page_title import PageTitle
-
class SelectWorkflowScreen(QWidget):
def __init__(self):
diff --git a/src/gui/main/main_window/main_window.py b/src/gui/main/main_window/main_window.py
index 0ced3596..88bf0014 100644
--- a/src/gui/main/main_window/main_window.py
+++ b/src/gui/main/main_window/main_window.py
@@ -5,7 +5,7 @@ from typing import Union
from PyQt6 import QtGui
from PyQt6.QtGui import QAction
-from PyQt6.QtWidgets import QMainWindow, QSplitter, QFileDialog, QMenuBar, QMenu
+from PyQt6.QtWidgets import QMainWindow, QSplitter, QFileDialog, QMenuBar, QMenu, QLabel
from src.cameras.detection.models import FoundCamerasResponse
from src.config.home_dir import (
@@ -20,7 +20,6 @@ from src.config.home_dir import (
)
from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (
CharucoBoardDefinition,
-
)
from src.core_processes.capture_volume_calibration.get_anipose_calibration_object import (
load_most_recent_anipose_calibration_toml,
@@ -50,7 +49,9 @@ import logging
from src.gui.main.workers.thread_worker_manager import ThreadWorkerManager
from src.log.config import LOG_FILE_PATH
-from src.sending_anonymous_user_info_to_places.send_pipedream_ping import send_pipedream_ping
+from src.sending_anonymous_user_info_to_places.send_pipedream_ping import (
+ send_pipedream_ping,
+)
# reboot GUI method based on this - https://stackoverflow.com/a/56563926/14662833
EXIT_CODE_REBOOT = -123456789
@@ -68,6 +69,9 @@ class MainWindow(QMainWindow):
self.setWindowTitle("freemocap \U0001F480 \U00002728")
# self._set_icon()
+
+
+
self._main_window_width = int(1920 * 0.9)
self._main_window_height = int(1080 * 0.8)
APP_STATE.main_window_height = self._main_window_height
@@ -77,13 +81,6 @@ class MainWindow(QMainWindow):
self.setMaximumHeight(1000)
self._main_layout = self._create_main_layout()
- # create actions
- self._create_actions()
- self._connect_actions_to_slots()
-
- # menu bar
- self._create_menu_bar()
-
# left side (control) panel
self._control_panel = self._create_control_panel()
self._main_layout.addWidget(self._control_panel.frame)
@@ -120,44 +117,6 @@ class MainWindow(QMainWindow):
self.setCentralWidget(main_layout)
return main_layout
- def _create_menu_bar(self):
- """
- based mostly on: https://realpython.com/python-menus-toolbars/
- """
- menu_bar = QMenuBar()
- self.setMenuBar(menu_bar)
-
- # file menu
- file_menu = QMenu("&File", parent=menu_bar)
- menu_bar.addMenu(file_menu)
-
- file_menu.addAction(self._new_session_action)
- file_menu.addAction(self._load_most_recent_session_action)
- file_menu.addAction(self._load_session_action)
- file_menu.addAction(self._reboot_gui_action)
- file_menu.addAction(self._exit_action)
-
- # help menu
- help_menu = QMenu("&Help", parent=menu_bar)
- menu_bar.addMenu(help_menu)
- help_menu.setEnabled(False)
-
- help_menu.addAction(self._open_docs_action)
- help_menu.addAction(self._about_us_action)
-
- # support menu
- support_menu = QMenu(
- "\U00002665 &Support the FreeMoCap Project", parent=menu_bar
- )
- support_menu.setEnabled(False)
- menu_bar.addMenu(support_menu)
-
- support_menu.addAction(self._donate_action)
- support_menu.addAction(self._send_usage_statistics_action)
- support_menu.addAction(self._user_survey_action)
-
- return menu_bar
-
def _create_control_panel(self):
panel = ControlPanel()
@@ -212,6 +171,11 @@ class MainWindow(QMainWindow):
self._load_session_action = QAction("&Load Session...", parent=self)
self._load_session_action.setShortcut("Ctrl+O")
+ self._import_external_videos_action = QAction(
+ "&Import External Videos...", parent=self
+ )
+ self._import_external_videos_action.setShortcut("Ctrl+I")
+
self._reboot_gui_action = QAction("&Reboot GUI", parent=self)
self._reboot_gui_action.setShortcut("Ctrl+R")
@@ -298,25 +262,6 @@ class MainWindow(QMainWindow):
def _connect_actions_to_slots(self):
- # File menu
- self._new_session_action = QAction("&Start New Session", parent=self)
- self._load_most_recent_session_action = QAction(
- "Load &Most Recent Session", parent=self
- )
- self._load_session_action = QAction("&Load Session...", parent=self)
- self._reboot_gui_action = QAction("&Reboot GUI", parent=self)
- self._exit_action = QAction("E&xit", parent=self)
-
- self._open_docs_action = QAction("Open &Documentation", parent=self)
- self._about_us_action = QAction("&About Us", parent=self)
-
- self._donate_action = QAction("&Donate", parent=self)
- self._send_usage_statistics_action = QAction(
- "Send &User Statistics", parent=self
- )
- self._user_survey_action = QAction("&User Survey", parent=self)
-
- def _connect_actions_to_slots(self):
self._new_session_action.triggered.connect(
lambda: self._start_session(
session_id=self._middle_viewing_panel.welcome_create_or_load_session_panel.session_id_input_string,
@@ -330,7 +275,15 @@ class MainWindow(QMainWindow):
self._load_session_action.triggered.connect(self._load_session_dialog)
+ self._todo_import_videos_pop_up = QLabel(
+ "\nTODO - pop up 'session id' panel, then a 'select video folder' dialog and copy those videos into the session folder\n"
+ )
+ self._import_external_videos_action.triggered.connect(
+ self._todo_import_videos_pop_up.show
+ )
+
self._reboot_gui_action.triggered.connect(self._reboot_gui)
+
self._exit_action.triggered.connect(self.close)
# Navigation Menu
@@ -356,7 +309,6 @@ class MainWindow(QMainWindow):
)
)
-
# self._open_docs_action.triggered.connect()
# self._about_us_action.triggered.connect()
# self._donate_action.triggered.connect()
@@ -366,6 +318,7 @@ class MainWindow(QMainWindow):
def _connect_buttons_to_stuff(self):
logger.info("Connecting buttons to stuff")
+ # Welcome Panel
self._middle_viewing_panel.welcome_create_or_load_session_panel.start_new_session_button.clicked.connect(
self._new_session_action.trigger
)
@@ -378,6 +331,10 @@ class MainWindow(QMainWindow):
self._load_session_action.trigger
)
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.import_external_videos_button.clicked.connect(
+ self._import_external_videos_action.trigger
+ )
+
# Camera Control Panel
self._control_panel.camera_setup_control_panel.apply_settings_to_cameras_button.clicked.connect(
self._apply_settings_and_launch_camera_threads
@@ -514,9 +471,10 @@ class MainWindow(QMainWindow):
def _start_session(self, session_id: str, new_session: bool = False):
-
- if self._middle_viewing_panel.welcome_create_or_load_session_panel.send_pings_checkbox.isChecked():
- send_pipedream_ping('session_started')
+ if (
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.send_pings_checkbox.isChecked()
+ ):
+ send_pipedream_ping("session_started")
self._session_id = session_id
self._control_panel.enable_toolbox_panels()
@@ -587,14 +545,12 @@ class MainWindow(QMainWindow):
self._cameras_are_popped_out = pop_out_camera_windows
- if self._cameras_are_popped_out:
- self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setText(
- "Dock cameras"
- )
- else:
- self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setText(
- "Pop out cameras"
- )
+ self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setEnabled(
+ not pop_out_camera_windows
+ )
+ self._control_panel.camera_setup_control_panel.dock_cameras_button.setEnabled(
+ pop_out_camera_windows
+ )
self._middle_viewing_panel.camera_stream_grid_view.create_and_start_camera_widgets(
dictionary_of_webcam_configs=dictionary_of_webcam_configs,
@@ -652,6 +608,7 @@ class MainWindow(QMainWindow):
self._session_id
)
charuco_board_definition = self._get_user_specified_charuco_definition()
+ logger.info(f"Launching Anipose calibration thread worker with the following parameters: {charuco_board_definition.__dict__}")
self._thread_worker_manager.launch_anipose_calibration_thread_worker(
charuco_board_definition=charuco_board_definition,
calibration_videos_folder_path=calibration_videos_folder_path,
@@ -737,7 +694,7 @@ class MainWindow(QMainWindow):
self._open_blender_file(blender_file_path)
def _open_blender_file(self, blender_file_path: Union[str, Path]):
- logger.info(f"Opening {Path(blender_file_path)}")
+ logger.info(f"Opening {str(blender_file_path)}")
os.startfile(str(blender_file_path))
def _visualize_motion_capture_data(self):
diff --git a/src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py b/src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py
index 6f2d7279..f86db2ea 100644
--- a/src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py
+++ b/src/gui/main/main_window/middle_panel_viewers/camera_stream_grid_view.py
@@ -1,5 +1,6 @@
from typing import List, Dict, Callable
+import cv2
import numpy as np
from PyQt6 import QtCore, QtGui
from PyQt6.QtCore import pyqtSignal
@@ -10,6 +11,7 @@ from PyQt6.QtWidgets import (
QLabel,
QDockWidget,
QPushButton,
+ QHBoxLayout,
)
from src.cameras.detection.models import FoundCamerasResponse
@@ -33,17 +35,27 @@ class CameraStreamGridView(QWidget):
self._layout = QVBoxLayout()
self.setLayout(self._layout)
+ # for landscape camera streams (e.g. rotate 0 or 180 degrees)
+ self._horizontal_layout = QHBoxLayout()
+ self._layout.addLayout(self._horizontal_layout)
+
+ # for portrait camera streams (e.g. rotate 90 or 270 degrees)
+ self._vertical_layout = QVBoxLayout()
+ self._layout.addLayout(self._vertical_layout)
+
def create_and_start_camera_widgets(
self,
dictionary_of_webcam_configs=Dict[str, WebcamConfig],
pop_out_camera_windows: bool = False,
):
logger.info("Creating camera widgets...")
- clear_layout(self._layout)
if hasattr(self, "_dictionary_of_camera_widgets"):
self.close_camera_widgets()
+ clear_layout(self._horizontal_layout)
+ clear_layout(self._vertical_layout)
+
self._dictionary_of_camera_configs = dictionary_of_webcam_configs
self._dictionary_of_camera_widgets = {}
@@ -55,15 +67,17 @@ class CameraStreamGridView(QWidget):
self._dictionary_of_camera_widgets[id].setWindowTitle(f"Camera {id}")
self._dictionary_of_camera_widgets[id].show()
else:
- camera_layout = QVBoxLayout()
- camera_layout.addWidget(
- QLabel(f"Camera {str(webcam_config.webcam_id)}")
- )
- camera_layout.addWidget(
- self._dictionary_of_camera_widgets[str(webcam_config.webcam_id)]
- )
- self._layout.addLayout(camera_layout)
-
+ if (
+ webcam_config.rotate_video_cv2_code == None
+ or webcam_config.rotate_video_cv2_code == cv2.ROTATE_180
+ ):
+ self._vertical_layout.addWidget(
+ self._dictionary_of_camera_widgets[id]
+ )
+ else:
+ self._horizontal_layout.addWidget(
+ self._dictionary_of_camera_widgets[id]
+ )
self.start_camera_widgets()
def start_camera_widgets(self):
diff --git a/src/gui/main/style_stuff/__init__.py b/src/gui/main/style_stuff/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/gui/main/style_stuff/css_style_sheet.py b/src/gui/main/style_stuff/css_style_sheet.py
new file mode 100644
index 00000000..ff1e3177
--- /dev/null
+++ b/src/gui/main/style_stuff/css_style_sheet.py
@@ -0,0 +1,24 @@
+qt_app_css_style_sheet = """
+
+ QMainWindow {
+ background-color: #3d7072;
+ }
+
+ QPushButton {
+ background-color: #2b4e50;
+ color: #ffffff;
+ border-radius: 4px;
+ font-size: 13px;
+ }
+ QPushButton:hover {
+ background-color: #7b3f60;
+ }
+ QPushButton:disabled {
+ background-color: #6d8587;
+ }
+
+ """
+
+recommended_next_button_style_sheet = """
+ border: 2px solid #d95157;
+ """
\ No newline at end of file
diff --git a/src/gui/main/qt_utils/set_font_size.py b/src/gui/main/style_stuff/set_font_size.py
similarity index 100%
rename from src/gui/main/qt_utils/set_font_size.py
rename to src/gui/main/style_stuff/set_font_size.py
diff --git a/src/gui/main/style_stuff/styled_widgets/__init__.py b/src/gui/main/style_stuff/styled_widgets/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/gui/main/styled_widgets/page_title.py b/src/gui/main/style_stuff/styled_widgets/page_title.py
similarity index 100%
rename from src/gui/main/styled_widgets/page_title.py
rename to src/gui/main/style_stuff/styled_widgets/page_title.py
diff --git a/src/gui/main/styled_widgets/primary_button.py b/src/gui/main/style_stuff/styled_widgets/primary_button.py
similarity index 91%
rename from src/gui/main/styled_widgets/primary_button.py
rename to src/gui/main/style_stuff/styled_widgets/primary_button.py
index b46d2312..a48003b6 100644
--- a/src/gui/main/styled_widgets/primary_button.py
+++ b/src/gui/main/style_stuff/styled_widgets/primary_button.py
@@ -8,9 +8,6 @@ active_primary_button_style_sheet = """
min-height: 24px;
font-size: 16px;
}
- QPushButton:hover {
- background-color: #365d5f;
- }
"""
diff --git a/src/gui/main/workers/cam_charuco_frame_thread_worker.py b/src/gui/main/workers/cam_charuco_frame_thread_worker.py
index 9a800d3e..f3befb14 100644
--- a/src/gui/main/workers/cam_charuco_frame_thread_worker.py
+++ b/src/gui/main/workers/cam_charuco_frame_thread_worker.py
@@ -1,4 +1,5 @@
import cv2
+import numpy as np
from PyQt6.QtCore import QThread, pyqtSignal
from PyQt6.QtGui import QImage
@@ -96,17 +97,18 @@ class CamCharucoFrameThreadWorker(QThread):
image_to_display = charuco_payload.annotated_image
image_to_display = cv2.flip(image_to_display, 1)
image_to_display = cv2.cvtColor(image_to_display, cv2.COLOR_BGR2RGB)
- converted_frame = QImage(
+ q_image = QImage(
image_to_display.data,
image_to_display.shape[1],
image_to_display.shape[0],
QImage.Format.Format_RGB888,
)
- converted_frame = converted_frame.scaledToHeight(
- APP_STATE.main_window_height / len(APP_STATE.available_cameras)
+ #TODO - Figure out why this is needed lol
+ q_image = q_image.scaledToHeight(
+ APP_STATE.main_window_height / 1#np.min([3,len(APP_STATE.available_cameras)])
)
- self.image_updated_signal.emit(converted_frame)
+ self.image_updated_signal.emit(q_image)
finally:
logger.info(f"Closing Camera {self._open_cv_camera.webcam_id_as_str}")
self._open_cv_camera.close()
diff --git a/src/gui/main/workers/session_playback_thread_worker.py b/src/gui/main/workers/session_playback_thread_worker.py
index 1208740a..512ddbdd 100644
--- a/src/gui/main/workers/session_playback_thread_worker.py
+++ b/src/gui/main/workers/session_playback_thread_worker.py
@@ -97,7 +97,6 @@ class SessionPlaybackThreadWorker(QThread):
def _update_skeleton(self, frame_number: int):
-
this_frame_skeleton_data = self._skeleton_3d_frame_trackedPoint_dimension[
frame_number, :, :
]
diff --git a/src/sending_anonymous_user_info_to_places/send_pipedream_ping.py b/src/sending_anonymous_user_info_to_places/send_pipedream_ping.py
index fe074d9f..b4c99802 100644
--- a/src/sending_anonymous_user_info_to_places/send_pipedream_ping.py
+++ b/src/sending_anonymous_user_info_to_places/send_pipedream_ping.py
@@ -4,7 +4,11 @@ import requests
logger = logging.getLogger(__name__)
-def send_pipedream_ping(pinged_string):
- logger.info("sending anonymous ping to pipedream to let the devs know that someone is using this, which will allow us to secure more funding to support this project")
- r = requests.post('https://eoivu13g86if0cp.m.pipedream.net', json={'pinged_string': pinged_string})
+def send_pipedream_ping(pinged_string):
+ logger.info(
+ "sending anonymous ping to pipedream to let the devs know that someone is using this, which will allow us to secure more funding to support this project"
+ )
+ r = requests.post(
+ "https://eoivu13g86if0cp.m.pipedream.net", json={"pinged_string": pinged_string}
+ )