Skip to content

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

TypeScript

Jon/visualize mocap data (#236)

jonmatthis0d3127ecc9fc
diff --git a/src/api/routes/session/session_router.py b/src/api/routes/session/session_router.py
index bbe913a1..a9d9920b 100644
--- a/src/api/routes/session/session_router.py
+++ b/src/api/routes/session/session_router.py
@@ -17,7 +17,7 @@ from src.config.home_dir import (
get_most_recent_session_id,
create_session_folder,
)
-from src.core_processes.mediapipe_2d_skeleton_detector.mediapipe_skeleton_detector import (
+from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
MediaPipeSkeletonDetector,
)
from src.pipelines.calibration_pipeline.calibration_pipeline_orchestrator import (
diff --git a/src/cameras/persistence/video_writer/video_recorder.py b/src/cameras/persistence/video_writer/video_recorder.py
index 4c0eab3c..1918fc7a 100644
--- a/src/cameras/persistence/video_writer/video_recorder.py
+++ b/src/cameras/persistence/video_writer/video_recorder.py
@@ -9,14 +9,7 @@ import numpy as np
import pandas as pd
from src.cameras.capture.dataclasses.frame_payload import FramePayload
-from src.cameras.persistence.video_writer.save_options_dataclass import SaveOptions
-from src.config.data_paths import freemocap_data_path
-from src.config.home_dir import (
- get_session_folder_path,
- get_synchronized_videos_folder_path,
- get_calibration_videos_folder_path,
- get_mediapipe_annotated_videos_folder_path,
-)
+
logger = logging.getLogger(__name__)
diff --git a/src/config/home_dir.py b/src/config/home_dir.py
index c9d3f7ac..e149953e 100644
--- a/src/config/home_dir.py
+++ b/src/config/home_dir.py
@@ -104,9 +104,7 @@ def get_calibration_videos_folder_path(session_id: str, create_folder: bool = Tr
return str(calibration_videos_path)
-def get_mediapipe_annotated_videos_folder_path(
- session_id: str, create_folder: bool = True
-):
+def get_annotated_videos_folder_path(session_id: str, create_folder: bool = False):
annotated_videos_path = (
Path(get_session_folder_path(session_id)) / ANNOTATED_VIDEOS_FOLDER_NAME
)
diff --git a/src/core_processes/mediapipe_2d_skeleton_detector/load_mediapipe2d_data.py b/src/core_processes/mediapipe_stuff/load_mediapipe2d_data.py
similarity index 100%
rename from src/core_processes/mediapipe_2d_skeleton_detector/load_mediapipe2d_data.py
rename to src/core_processes/mediapipe_stuff/load_mediapipe2d_data.py
diff --git a/src/core_processes/mediapipe_stuff/load_mediapipe3d_data.py b/src/core_processes/mediapipe_stuff/load_mediapipe3d_data.py
new file mode 100644
index 00000000..826193d7
--- /dev/null
+++ b/src/core_processes/mediapipe_stuff/load_mediapipe3d_data.py
@@ -0,0 +1,21 @@
+from pathlib import Path
+from typing import Union
+
+import logging
+
+import numpy as np
+
+logger = logging.getLogger(__name__)
+
+
+def load_mediapipe3d_data(output_data_folder_path: Union[str, Path]):
+ mediapipe3d_xyz_file_path = (
+ Path(output_data_folder_path)
+ / "mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ.npy"
+ )
+ logger.info(f"loading: {mediapipe3d_xyz_file_path}")
+ mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ = np.load(
+ str(mediapipe3d_xyz_file_path)
+ )
+
+ return mediapipe_3dData_numFrames_numTrackedPoints_spatialXYZ
diff --git a/src/core_processes/mediapipe_2d_skeleton_detector/medaipipe_tracked_points_names_dict.py b/src/core_processes/mediapipe_stuff/medaipipe_tracked_points_names_dict.py
similarity index 100%
rename from src/core_processes/mediapipe_2d_skeleton_detector/medaipipe_tracked_points_names_dict.py
rename to src/core_processes/mediapipe_stuff/medaipipe_tracked_points_names_dict.py
diff --git a/src/core_processes/mediapipe_2d_skeleton_detector/mediapipe_default_settings.py b/src/core_processes/mediapipe_stuff/mediapipe_default_settings.py
similarity index 100%
rename from src/core_processes/mediapipe_2d_skeleton_detector/mediapipe_default_settings.py
rename to src/core_processes/mediapipe_stuff/mediapipe_default_settings.py
diff --git a/src/core_processes/mediapipe_2d_skeleton_detector/mediapipe_skeleton_detector.py b/src/core_processes/mediapipe_stuff/mediapipe_skeleton_detector.py
similarity index 99%
rename from src/core_processes/mediapipe_2d_skeleton_detector/mediapipe_skeleton_detector.py
rename to src/core_processes/mediapipe_stuff/mediapipe_skeleton_detector.py
index 5915fb0c..dd898ed9 100644
--- a/src/core_processes/mediapipe_2d_skeleton_detector/mediapipe_skeleton_detector.py
+++ b/src/core_processes/mediapipe_stuff/mediapipe_skeleton_detector.py
@@ -14,7 +14,7 @@ from src.config.home_dir import (
get_synchronized_videos_folder_path,
get_output_data_folder_path,
)
-from src.core_processes.mediapipe_2d_skeleton_detector.medaipipe_tracked_points_names_dict import (
+from src.core_processes.mediapipe_stuff.medaipipe_tracked_points_names_dict import (
mediapipe_tracked_point_names_dict,
)
diff --git a/src/core_processes/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py b/src/core_processes/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py
new file mode 100644
index 00000000..ab6937a3
--- /dev/null
+++ b/src/core_processes/mediapipe_stuff/mediapipe_skeleton_names_and_connections.py
@@ -0,0 +1,17 @@
+from mediapipe.python.solutions import holistic as mp_holistic
+
+mediapipe_body_connections = [connection for connection in mp_holistic.POSE_CONNECTIONS]
+
+mediapipe_hand_connections = [connection for connection in mp_holistic.HAND_CONNECTIONS]
+
+mediapipe_face_connections = [
+ connection for connection in mp_holistic.FACEMESH_TESSELATION
+]
+
+mediapipe_pose_landmark_names = [
+ landmark.name.lower() for landmark in mp_holistic.PoseLandmark
+]
+
+mediapipe_hand_landmark_names = [
+ landmark.name.lower() for landmark in mp_holistic.HandLandmark
+]
diff --git a/src/gui/icis_conference_main/workflows/record_videos.py b/src/gui/icis_conference_main/workflows/record_videos.py
index a1df08e6..c826bd62 100644
--- a/src/gui/icis_conference_main/workflows/record_videos.py
+++ b/src/gui/icis_conference_main/workflows/record_videos.py
@@ -8,7 +8,7 @@ from PyQt6.QtWidgets import (
)
from src.cameras.save_synchronized_videos import save_synchronized_videos
-from src.core_processes.mediapipe_2d_skeleton_detector.mediapipe_skeleton_detector import (
+from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
MediaPipeSkeletonDetector,
)
from src.gui.icis_conference_main.state.app_state import APP_STATE
diff --git a/src/gui/main/custom_widgets/single_camera_widget.py b/src/gui/main/custom_widgets/single_camera_widget.py
index 85317469..04e7a272 100644
--- a/src/gui/main/custom_widgets/single_camera_widget.py
+++ b/src/gui/main/custom_widgets/single_camera_widget.py
@@ -44,10 +44,6 @@ class SingleCameraWidget(QWidget):
self.setLayout(layout)
- @property
- def camera_id(self):
- return self._webcam_config.webcam_id
-
@property
def should_record_frames(self):
return self._worker.should_save_frames
diff --git a/src/gui/main/custom_widgets/video_player_widget.py b/src/gui/main/custom_widgets/video_player_widget.py
new file mode 100644
index 00000000..91b855b0
--- /dev/null
+++ b/src/gui/main/custom_widgets/video_player_widget.py
@@ -0,0 +1,54 @@
+import enum
+from pathlib import Path
+from typing import Union
+
+import cv2
+import numpy as np
+from PyQt6 import QtGui
+from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtGui import QPixmap, QImage
+from PyQt6.QtWidgets import QHBoxLayout, QWidget, QLabel
+
+import logging
+
+
+from src.gui.main.app_state.app_state import APP_STATE
+
+logger = logging.getLogger(__name__)
+
+
+class VideoPlayerWidget(QWidget):
+ def __init__(self):
+ super().__init__()
+
+ self._video_view_label = QLabel()
+ # self._video.setScaledContents(True)
+ layout = QHBoxLayout()
+ layout.addWidget(self._video_view_label)
+
+ self.setLayout(layout)
+
+ def update_image(self, image: np.ndarray):
+ q_image = QImage(
+ image.data,
+ image.shape[1],
+ image.shape[0],
+ QImage.Format.Format_RGB888,
+ )
+ # q_image = q_image.scaledToWidth(
+ # APP_STATE.main_window_width / len(APP_STATE.available_cameras)
+ # )
+
+ q_image = q_image.scaledToWidth(200)
+
+ self._pixmap = QPixmap.fromImage(q_image)
+ self._video_view_label.setPixmap(self._pixmap)
+
+ def resizeEvent(self, a0: QtGui.QResizeEvent) -> None:
+ logging.debug(f"window resized")
+
+ # TO DO - Some kinda something here to make the videos scale properly and keep their aspect ratio
+
+ # self._pixmap.scaled(
+ # self.width(), self.height(), Qt.KeepAspectRatio, Qt.SmoothTransformation
+ # )
diff --git a/src/gui/main/main.py b/src/gui/main/main.py
index bc6b9269..85b48cd5 100644
--- a/src/gui/main/main.py
+++ b/src/gui/main/main.py
@@ -6,7 +6,7 @@ from PyQt6.QtCore import QTimer
from PyQt6.QtWidgets import QApplication
from src.gui.main.app import get_qt_app
-from src.gui.main.main_window.main_window import MainWindow
+from src.gui.main.main_window.main_window import MainWindow, EXIT_CODE_REBOOT
logger = logging.getLogger(__name__)
@@ -29,10 +29,22 @@ if __name__ == "__main__":
logger.info("Starting main...")
signal.signal(signal.SIGINT, sigint_handler)
app = get_qt_app()
- 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.
- win = MainWindow()
- win.show()
- sys.exit(app.exec())
+ # 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()
+ win.show()
+ error_code = app.exec()
+ logger.info(f"`main` exited with error code: {error_code}")
+ win.close()
+ if error_code != EXIT_CODE_REBOOT:
+ logger.info(f"Exiting...")
+ break
+ else:
+ logger.info("`main` exited with the 'reboot' code, so let's reboot!")
+
+ sys.exit()
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 425a7141..5cc3bdf6 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
@@ -15,8 +15,8 @@ from src.gui.main.main_window.left_panel_controls.toolbox_widgets.calibrate_capt
from src.gui.main.main_window.left_panel_controls.toolbox_widgets.camera_setup_control_panel import (
CameraSetupControlPanel,
)
-from src.gui.main.main_window.left_panel_controls.toolbox_widgets.create_or_load_new_session_panel import (
- CreateOrLoadNewSessionPanel,
+from src.gui.main.main_window.left_panel_controls.toolbox_widgets.welcome_create_or_load_new_session_panel import (
+ WelcomeCreateOrLoadNewSessionPanel,
)
from src.gui.main.main_window.left_panel_controls.toolbox_widgets.process_session_data_panel import (
ProcessSessionDataPanel,
@@ -24,6 +24,9 @@ from src.gui.main.main_window.left_panel_controls.toolbox_widgets.process_sessio
from src.gui.main.main_window.left_panel_controls.toolbox_widgets.record_motion_capture_videos_panel import (
RecordMotionCatpureVideosPanel,
)
+from src.gui.main.main_window.left_panel_controls.toolbox_widgets.visualize_motion_capture_data import (
+ VisualizeMotionCaptureDataPanel,
+)
from src.gui.main.qt_utils.clear_layout import clear_layout
@@ -39,69 +42,84 @@ class ControlPanel:
self._layout = QVBoxLayout()
self._frame.setLayout(self._layout)
- self._create_toolbox_panels()
+ self._dictionary_of_toolbox_panels = self._create_dictionary_of_toolbox_panels()
self._toolbox_widget = self._create_toolbox_widget()
+ self._hide_toolbox_panels()
+ self._toolbox_widget.setEnabled(False)
self._layout.addWidget(self._toolbox_widget)
@property
def frame(self):
return self._frame
- @property
- def create_or_load_new_session_panel(self):
- return self._create_or_load_new_session_panel
+ # @property
+ # def create_or_load_new_session_panel(self):
+ # return self._create_or_load_new_session_panel
@property
def camera_setup_control_panel(self):
- return self._camera_setup_control_panel
+ return self._dictionary_of_toolbox_panels["Camera Setup and Control"]
@property
def calibrate_capture_volume_panel(self):
- return self._calibrate_capture_volume_panel
+ return self._dictionary_of_toolbox_panels["Calibrate Capture Volume"]
@property
def record_motion_capture_videos_panel(self):
- return self._record_motion_capture_videos_panel
+ return self._dictionary_of_toolbox_panels[
+ "Record and Process Motion Capture Videos"
+ ]
@property
def process_session_data_panel(self):
- return self._record_motion_capture_videos_panel.process_session_data_panel
+ return self.record_motion_capture_videos_panel.process_session_data_panel
+
+ @property
+ def visualize_motion_capture_data_panel(self):
+ return self._dictionary_of_toolbox_panels["Visualize Motion Capture Data"]
@property
def toolbox_widget(self):
return self._toolbox_widget
- def _start_standard_workflow(self):
- clear_layout(self._layout)
- self._create_toolbox_widget()
+ def show_toolbox_panels(self):
+ for panel in self._dictionary_of_toolbox_panels.values():
+ panel.show()
def _create_toolbox_widget(self):
toolbox_widget = QToolBox()
- toolbox_widget.addItem(
- self._create_or_load_new_session_panel, "Create or Load Session"
- )
-
- toolbox_widget.addItem(self._camera_setup_control_panel, "Camera Setup")
+ for item_name, panel in self._dictionary_of_toolbox_panels.items():
+ toolbox_widget.addItem(panel, item_name)
+ toolbox_widget.setCurrentWidget(panel)
+ return toolbox_widget
- toolbox_widget.addItem(
- self._calibrate_capture_volume_panel, "Calibrate Capture Volume"
- )
+ def _create_dictionary_of_toolbox_panels(self):
+ dictionary_of_toolbox_panels = {}
+ # self._create_or_load_new_session_panel = WelcomeCreateOrLoadNewSessionPanel()
+ dictionary_of_toolbox_panels[
+ "Camera Setup and Control"
+ ] = CameraSetupControlPanel()
+ dictionary_of_toolbox_panels[
+ "Calibrate Capture Volume"
+ ] = CalibrateCaptureVolumePanel()
+ dictionary_of_toolbox_panels[
+ "Record and Process Motion Capture Videos"
+ ] = RecordMotionCatpureVideosPanel()
+ dictionary_of_toolbox_panels[
+ "Visualize Motion Capture Data"
+ ] = VisualizeMotionCaptureDataPanel()
+ # self._process_session_data_panel = ProcessSessionDataPanel()
+ return dictionary_of_toolbox_panels
- toolbox_widget.addItem(
- self._record_motion_capture_videos_panel, "Record Motion Capture Videos"
- )
- # toolbox_widget.addItem(self._process_session_data_panel, "Process Session Data")
+ def _hide_toolbox_panels(self):
+ for panel in self._dictionary_of_toolbox_panels.values():
+ panel.hide()
- toolbox_widget.addItem(
- QLabel("View Motion Capture Data"), "View Motion Capture Data"
- )
+ def _show_toolbox_panels(self):
+ for panel in self._dictionary_of_toolbox_panels.values():
+ panel.show()
- return toolbox_widget
-
- def _create_toolbox_panels(self):
- self._create_or_load_new_session_panel = CreateOrLoadNewSessionPanel()
- self._camera_setup_control_panel = CameraSetupControlPanel()
- self._calibrate_capture_volume_panel = CalibrateCaptureVolumePanel()
- self._record_motion_capture_videos_panel = RecordMotionCatpureVideosPanel()
- # self._process_session_data_panel = ProcessSessionDataPanel()
+ def enable_toolbox_panels(self):
+ self._toolbox_widget.setEnabled(True)
+ self._show_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 4af85545..60737256 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
@@ -99,9 +99,7 @@ class CalibrateCaptureVolumePanel(QWidget):
return previous_calibration_checkbox
def _enable_or_disable_calibrate_from_videos_button(self):
- logger.debug(
- "`Process calibration videos automatically checkbox` state changed"
- )
+ logger.debug("Process calibration videos automatically checkbox state changed")
if self._process_automatically_checkbox.isChecked():
self._calibrate_capture_volume_from_videos_button.setEnabled(False)
else:
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 f5c3f9bb..b5515592 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
@@ -1,8 +1,8 @@
-from typing import List, Dict
+from typing import Dict
import cv2
from PyQt6.QtCore import pyqtSignal
-from PyQt6.QtWidgets import QVBoxLayout, QWidget, QPushButton
+from PyQt6.QtWidgets import QVBoxLayout, QWidget, QPushButton, QTextEdit, QLabel
from pyqtgraph.parametertree import ParameterTree, Parameter
from src.cameras.detection.models import FoundCamerasResponse
@@ -11,7 +11,9 @@ from src.gui.main.qt_utils.clear_layout import clear_layout
import logging
-from src.gui.main.styled_widgets.primary_button import PrimaryButton
+from src.gui.workflow_helper_blurbs.camera_setup_control_panel_help_blurb import (
+ camera_setup_control_panel_help_blurb_str,
+)
logger = logging.getLogger(__name__)
@@ -46,31 +48,35 @@ class CameraSetupControlPanel(QWidget):
def __init__(self):
super().__init__()
- self._panel_layout = QVBoxLayout()
- self.setLayout(self._panel_layout)
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
- self._apply_settings_to_cameras_button = PrimaryButton(
- "Launch Cameras",
- )
- self._apply_settings_to_cameras_button.setEnabled(True)
- self._panel_layout.addWidget(self._apply_settings_to_cameras_button)
+ helper_qlabel_widget = QLabel(camera_setup_control_panel_help_blurb_str)
+ helper_qlabel_widget.setWordWrap(True)
+ self._layout.addWidget(helper_qlabel_widget)
- self._redetect_cameras_button = QPushButton("Re-Detect Cameras")
+ self._redetect_cameras_button = QPushButton("Detect Cameras")
self._redetect_cameras_button.setEnabled(True)
- self._panel_layout.addWidget(self._redetect_cameras_button)
+ self._layout.addWidget(self._redetect_cameras_button)
+
+ self._apply_settings_to_cameras_button = QPushButton(
+ "Apply settings and Launch Cameras",
+ )
+ self._apply_settings_to_cameras_button.setEnabled(True)
+ self._layout.addWidget(self._apply_settings_to_cameras_button)
self._pop_out_cameras_button = QPushButton("Pop out cameras")
self._pop_out_cameras_button.setEnabled(False)
- self._panel_layout.addWidget(self._pop_out_cameras_button)
+ self._layout.addWidget(self._pop_out_cameras_button)
self._close_cameras_button = QPushButton("Close cameras")
- self._close_cameras_button.setEnabled(False)
- self._panel_layout.addWidget(self._close_cameras_button)
+ self._close_cameras_button.setEnabled(True)
+ self._layout.addWidget(self._close_cameras_button)
self._parameter_tree_layout = QVBoxLayout()
self._parameter_tree_widget = ParameterTree()
self._parameter_tree_layout.addWidget(self._parameter_tree_widget)
- self._panel_layout.addLayout(self._parameter_tree_layout)
+ self._layout.addLayout(self._parameter_tree_layout)
@property
def apply_settings_to_cameras_button(self):
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/create_or_load_new_session_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/create_or_load_new_session_panel.py
deleted file mode 100644
index b97e65ba..00000000
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/create_or_load_new_session_panel.py
+++ /dev/null
@@ -1,77 +0,0 @@
-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 CreateOrLoadNewSessionPanel(QWidget):
- def __init__(self):
- super().__init__()
-
- central_layout = QVBoxLayout()
-
- central_layout.addLayout(self._create_new_session_layout())
-
- self._load_most_recent_session_button = QPushButton(
- "Load Most &Recent Session",
- )
- self._load_most_recent_session_button.setEnabled(True)
- central_layout.addWidget(self._load_most_recent_session_button)
-
- self._reset_folder_view_to_freemocap_data_folder_button = QPushButton(
- "Reset Folder view to FreeMoCap folder"
- )
- self._reset_folder_view_to_freemocap_data_folder_button.setEnabled(True)
- central_layout.addWidget(
- self._reset_folder_view_to_freemocap_data_folder_button
- )
-
- self._import_external_videos_button = QPushButton(
- "TO DO - Import External &Videos"
- )
- self._import_external_videos_button.setEnabled(False)
- central_layout.addWidget(self._import_external_videos_button)
-
- self.setLayout(central_layout)
-
- @property
- def start_new_session_button(self):
- return self._start_new_session_button
-
- @property
- def load_most_recent_session_button(self):
- return self._load_most_recent_session_button
-
- @property
- def reset_folder_view_to_freemocap_data_folder_button(self):
- return self._reset_folder_view_to_freemocap_data_folder_button
-
- @property
- def session_id_input_string(self):
- return self._session_input.text()
-
- def _create_session_input(self):
- session_text_input = QLineEdit()
- session_text_input.setText(create_default_session_id())
- return session_text_input
-
- def _create_new_session_layout(self):
- layout = QVBoxLayout()
-
- session_id_form_layout = QFormLayout()
- self._session_input = self._create_session_input()
- session_id_form_layout.addRow(QLabel("Session Id"), self._session_input)
- layout.addLayout(session_id_form_layout)
- layout.setAlignment(Qt.AlignBottom)
-
- self._start_new_session_button = PrimaryButton("&Start Session")
- layout.addWidget(self._start_new_session_button)
- return layout
diff --git a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/process_session_data_panel.py b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/process_session_data_panel.py
index d8087f41..6be7679e 100644
--- a/src/gui/main/main_window/left_panel_controls/toolbox_widgets/process_session_data_panel.py
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/process_session_data_panel.py
@@ -13,14 +13,16 @@ from PyQt6.QtWidgets import (
QLabel,
)
-from src.core_processes.mediapipe_2d_skeleton_detector.mediapipe_default_settings import (
+from src.core_processes.mediapipe_stuff.mediapipe_default_settings import (
default_mediapipe_confidence_threshold,
)
from src.export_stuff.blender_stuff.get_best_guess_of_blender_path import (
get_best_guess_of_blender_path,
)
-from src.gui.main.tool_tips.tool_tips import mediapipe_confidence_cutoff_tool_tip_str
+from src.gui.main.tool_tips.tool_tips_strings import (
+ mediapipe_confidence_cutoff_tool_tip_str,
+)
logger = logging.getLogger(__name__)
@@ -141,6 +143,7 @@ class ProcessSessionDataPanel(QWidget):
return blender_path_layout
def _open_blender_path_file_dialog(self):
+ # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
self._blender_exe_path_str = QFileDialog.getOpenFileName()
self._blender_exe_path_str = self._blender_exe_path_str[0]
logger.info(f"User selected Blender path:{self._blender_exe_path_str}")
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
new file mode 100644
index 00000000..b463e5ff
--- /dev/null
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/visualize_motion_capture_data.py
@@ -0,0 +1,41 @@
+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):
+ super().__init__()
+
+ self._layout = QVBoxLayout()
+
+ self._load_session_data_button = QPushButton(
+ "Load Session Data",
+ )
+ self._load_session_data_button.setEnabled(True)
+ self._layout.addWidget(self._load_session_data_button)
+
+ self._play_button = QPushButton("Play")
+ self._play_button.setEnabled(False)
+ self._layout.addWidget(self._play_button)
+
+ self._pause_button = QPushButton("Pause")
+ self._pause_button.setEnabled(False)
+ self._layout.addWidget(self._pause_button)
+
+ self._layout.addStretch()
+
+ self.setLayout(self._layout)
+
+ @property
+ def load_session_data_button(self):
+ return self._load_session_data_button
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
new file mode 100644
index 00000000..32a970a7
--- /dev/null
+++ b/src/gui/main/main_window/left_panel_controls/toolbox_widgets/welcome_create_or_load_new_session_panel.py
@@ -0,0 +1,101 @@
+import logging
+
+from PyQt6 import QtCore
+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.page_title import PageTitle
+from src.gui.main.styled_widgets.primary_button import PrimaryButton
+
+logger = logging.getLogger(__name__)
+
+
+class WelcomeCreateOrLoadNewSessionPanel(QWidget):
+ def __init__(self):
+ super().__init__()
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._layout.addStretch()
+ self._welcome_to_freemocap_title_widget = self._welcome_to_freemocap_title()
+ self._layout.addWidget(self._welcome_to_freemocap_title_widget)
+
+ self._layout.addStretch()
+
+ self._layout.addLayout(self._create_get_session_id_form_layout())
+
+ self._start_new_session_button = PrimaryButton("&Start New Session")
+ self._layout.addWidget(self._start_new_session_button)
+
+ self._load_most_recent_session_button = QPushButton(
+ "Load Most &Recent Session",
+ )
+ self._load_most_recent_session_button.setEnabled(True)
+ self._layout.addWidget(self._load_most_recent_session_button)
+
+ self._load_session_button = QPushButton(
+ "Load Session",
+ )
+ 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._layout.addWidget(self._import_external_videos_button)
+
+ self._layout.addStretch()
+
+ @property
+ def start_new_session_button(self):
+ return self._start_new_session_button
+
+ @property
+ def load_most_recent_session_button(self):
+ return self._load_most_recent_session_button
+
+ @property
+ def load_session_button(self):
+ return self._load_session_button
+
+ @property
+ def session_id_input_string(self):
+ return self._session_input.text()
+
+ def _welcome_to_freemocap_title(self):
+ # TO DO - this shouldn't be part of the `camera_view_panel` - it should be its own thing that gets swapped out on session start
+ logger.info("Creating `welcome to freemocap` widget")
+ welcome_widget = QWidget()
+ layout = QVBoxLayout()
+ welcome_widget.setLayout(layout)
+
+ session_title_widget = PageTitle(
+ "Welcome to FreeMoCap! \n \U00002728 \U0001F480 \U00002728 "
+ )
+ layout.addWidget(session_title_widget, QtCore.Qt.AlignCenter)
+
+ alpha_version_text_str = "This is an *early* version of the `alpha` version of this software, so like - Manage your Expectations lol "
+ layout.addWidget(QLabel(alpha_version_text_str), QtCore.Qt.AlignCenter)
+
+ return welcome_widget
+
+ def _create_session_id_input(self):
+ session_text_input = QLineEdit()
+ session_text_input.setText(create_default_session_id())
+ return session_text_input
+
+ def _create_get_session_id_form_layout(self):
+ session_id_form_layout = QFormLayout()
+ self._session_input = self._create_session_id_input()
+ session_id_form_layout.addRow(QLabel("Session Id"), self._session_input)
+ return session_id_form_layout
diff --git a/src/gui/main/main_window/main_window.py b/src/gui/main/main_window/main_window.py
index 73eac7a2..d09c99e4 100644
--- a/src/gui/main/main_window/main_window.py
+++ b/src/gui/main/main_window/main_window.py
@@ -1,11 +1,11 @@
import os
import shutil
-import traceback
from pathlib import Path
from typing import Union
from PyQt6 import QtGui
-from PyQt6.QtWidgets import QMainWindow, QSplitter
+from PyQt6.QtGui import QAction
+from PyQt6.QtWidgets import QMainWindow, QSplitter, QFileDialog, QMenuBar, QMenu
from src.cameras.detection.models import FoundCamerasResponse
from src.config.home_dir import (
@@ -16,30 +16,39 @@ from src.config.home_dir import (
get_output_data_folder_path,
get_most_recent_session_id,
get_freemocap_data_folder_path,
- get_log_file_path,
+ get_annotated_videos_folder_path,
)
from src.core_processes.capture_volume_calibration.get_anipose_calibration_object import (
load_most_recent_anipose_calibration_toml,
load_calibration_from_session_id,
)
-from src.core_processes.mediapipe_2d_skeleton_detector.load_mediapipe2d_data import (
+from src.core_processes.mediapipe_stuff.load_mediapipe2d_data import (
load_mediapipe2d_data,
)
+from src.core_processes.mediapipe_stuff.load_mediapipe3d_data import (
+ load_mediapipe3d_data,
+)
from src.export_stuff.blender_stuff.export_to_blender import (
export_to_blender,
)
+from src.gui.main.app import get_qt_app
from src.gui.main.app_state.app_state import APP_STATE
from src.gui.main.main_window.left_panel_controls.control_panel import ControlPanel
from src.gui.main.main_window.right_side_panel.right_side_panel import (
RightSidePanel,
)
-from src.gui.main.main_window.middle_panel_viewers.camera_view_panel import (
- CameraViewPanel,
+from src.gui.main.main_window.middle_panel_viewers.session_playback_view.middle_viewing_panel import (
+ MiddleViewingPanel,
)
import logging
from src.gui.main.workers.thread_worker_manager import ThreadWorkerManager
+from src.log.config import LOG_FILE_PATH
+
+# reboot GUI method based on this - https://stackoverflow.com/a/56563926/14662833
+EXIT_CODE_REBOOT = -123456789
+
logger = logging.getLogger(__name__)
@@ -49,7 +58,10 @@ class MainWindow(QMainWindow):
logger.info("Creating main window")
super().__init__()
- self.setWindowTitle("freemocap")
+
+ 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
@@ -59,13 +71,20 @@ 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)
# middle (viewing) panel
- self._camera_view_panel = self._create_cameras_view_panel()
- self._main_layout.addWidget(self._camera_view_panel.frame)
+ self._middle_viewing_panel = self._create_middle_viewing_panel()
+ self._main_layout.addWidget(self._middle_viewing_panel.frame)
# right side (info) panel
self._right_side_panel = self._create_right_side_panel()
@@ -77,10 +96,13 @@ class MainWindow(QMainWindow):
self._connect_signals_to_stuff()
self._connect_buttons_to_stuff()
+ self._auto_launch_camera_streams = False
self._auto_process_next_stage = False
self._cameras_are_popped_out = False
self._cameras_are_popped_out = False
+ self._session_id = None
+
def _create_main_layout(self):
main_layout = QSplitter()
# widget = QWidget()
@@ -88,6 +110,44 @@ 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()
@@ -102,8 +162,8 @@ class MainWindow(QMainWindow):
return panel
- def _create_cameras_view_panel(self):
- panel = CameraViewPanel()
+ def _create_middle_viewing_panel(self):
+ panel = MiddleViewingPanel()
width = self._main_window_width * 0.7
height = self._main_window_height
panel.frame.setMinimumHeight(height)
@@ -129,21 +189,59 @@ class MainWindow(QMainWindow):
return panel
- def _connect_buttons_to_stuff(self):
- logger.info("Connecting buttons to stuff")
+ def _create_actions(self):
+ 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._control_panel.create_or_load_new_session_panel.start_new_session_button.clicked.connect(
+ 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(
- self._control_panel._create_or_load_new_session_panel.session_id_input_string
+ session_id=self._middle_viewing_panel.welcome_create_or_load_session_panel.session_id_input_string,
+ new_session=True,
)
)
- self._control_panel.create_or_load_new_session_panel.reset_folder_view_to_freemocap_data_folder_button.clicked.connect(
- self._right_side_panel.file_system_view_widget.set_folder_view_to_freemocap_data_folder
+ self._load_most_recent_session_action.triggered.connect(
+ lambda: self._start_session(get_most_recent_session_id())
)
- self._control_panel._create_or_load_new_session_panel.load_most_recent_session_button.clicked.connect(
- lambda: self._start_session(get_most_recent_session_id())
+ self._load_session_action.triggered.connect(self._load_session_dialog)
+
+ self._reboot_gui_action.triggered.connect(self._reboot_gui)
+ self._exit_action.triggered.connect(self.close)
+ # self._open_docs_action.triggered.connect()
+ # self._about_us_action.triggered.connect()
+ # self._donate_action.triggered.connect()
+ # self._send_usage_statistics_action.triggered.connect()
+ # self._user_survey_action.triggered.connect()
+
+ def _connect_buttons_to_stuff(self):
+ logger.info("Connecting buttons to stuff")
+
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.start_new_session_button.clicked.connect(
+ self._new_session_action.trigger
+ )
+
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.load_most_recent_session_button.clicked.connect(
+ self._load_most_recent_session_action.trigger
+ )
+
+ self._middle_viewing_panel.welcome_create_or_load_session_panel.load_session_button.clicked.connect(
+ self._load_session_action.trigger
)
# Camera Control Panel
@@ -159,6 +257,10 @@ class MainWindow(QMainWindow):
self._handle_pop_out_cameras_button_pressed
)
+ self._control_panel.camera_setup_control_panel.close_cameras_button.clicked.connect(
+ self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets
+ )
+
# Calibration panel
self._control_panel.calibrate_capture_volume_panel.start_recording_button.clicked.connect(
lambda: self._start_recording_videos(
@@ -190,7 +292,7 @@ class MainWindow(QMainWindow):
)
)
- # ProcessVideos panel
+ # (record videos) ProcessVideos panel
self._control_panel.process_session_data_panel.detect_2d_skeletons_button.clicked.connect(
self._setup_and_launch_mediapipe_2d_detection_thread_worker
)
@@ -203,6 +305,16 @@ class MainWindow(QMainWindow):
self._export_to_blender
)
+ # Visualize Mocap Data panel
+ self._control_panel.visualize_motion_capture_data_panel.load_session_data_button.clicked.connect(
+ self._visualize_motion_capture_data
+ )
+
+ # (right side) File viewer panel
+ self._right_side_panel.file_system_view_widget.show_current_session_folder_button.clicked.connect(
+ lambda: self._set_session_folder_as_root_for_file_viewer(self._session_id)
+ )
+
def _connect_signals_to_stuff(self):
logger.info("Connecting signals to stuff")
@@ -218,8 +330,8 @@ class MainWindow(QMainWindow):
# self._apply_settings_and_launch_camera_threads
# )
- self._camera_view_panel.camera_stream_grid_view.cameras_connected_signal.connect(
- self._camera_view_panel.show_camera_streams
+ self._middle_viewing_panel.camera_stream_grid_view.cameras_connected_signal.connect(
+ self._middle_viewing_panel.show_camera_streams
)
self._thread_worker_manager.videos_saved_signal.connect(
@@ -244,17 +356,54 @@ class MainWindow(QMainWindow):
self._open_blender_file
)
- def _start_session(self, session_id: str):
+ def _set_session_folder_as_root_for_file_viewer(self, session_id: str):
+ session_path = get_session_folder_path(session_id, create_folder=True)
+ self._right_side_panel.file_system_view_widget.set_folder_as_root(session_path)
+
+ def _load_session_dialog(self):
+ # from this tutorial - https://www.youtube.com/watch?v=gg5TepTc2Jg&t=649s
+ user_selected_path = QFileDialog.getExistingDirectory(
+ self,
+ "Select the session folder you want to load...",
+ get_freemocap_data_folder_path(),
+ )
+
+ self._session_id = str(
+ Path(user_selected_path).relative_to(get_freemocap_data_folder_path())
+ )
+
+ logger.info(
+ f"User selected session path:{user_selected_path}, `session_id` set to {self._session_id}"
+ )
+
+ self._start_session(self._session_id)
+
+ def _start_session(self, session_id: str, new_session: bool = False):
self._session_id = session_id
+ self._control_panel.enable_toolbox_panels()
+ self._set_session_folder_as_root_for_file_viewer(self._session_id)
+ self._right_side_panel.file_system_view_widget.show_current_session_folder_button.setEnabled(
+ True
+ )
+
+ text = (
+ self._right_side_panel.file_system_view_widget.show_current_session_folder_button.text()
+ )
+ self._right_side_panel.file_system_view_widget.show_current_session_folder_button.setText(
+ text + ", session_id: " + self._session_id
+ )
- session_path = get_session_folder_path(self._session_id, create_folder=True)
- self._right_side_panel.file_system_view_widget.set_folder_as_root(session_path)
self._thread_worker_manager.launch_detect_cameras_worker()
self._control_panel.toolbox_widget.setCurrentWidget(
self._control_panel.camera_setup_control_panel
)
+ self._middle_viewing_panel.show_camera_streams()
+
+ if new_session:
+ self._auto_launch_camera_streams = True
+
def _handle_found_cameras_response(
self, found_cameras_response: FoundCamerasResponse
):
@@ -263,9 +412,13 @@ class MainWindow(QMainWindow):
found_cameras_response
)
+ if self._auto_launch_camera_streams:
+ self._auto_launch_camera_streams = False
+ self._apply_settings_and_launch_camera_threads()
+
def _redetect_cameras(self):
try:
- self._camera_view_panel.camera_stream_grid_view.close_camera_widgets()
+ self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets()
except Exception as e:
logger.info(e)
raise e
@@ -276,15 +429,12 @@ class MainWindow(QMainWindow):
):
logger.info("Applying settings and launching camera threads")
- self._control_panel.camera_setup_control_panel.apply_settings_to_cameras_button.setText(
- "Apply settings and re-launch cameras"
- )
self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setEnabled(
True
)
try:
- self._camera_view_panel.camera_stream_grid_view.close_camera_widgets()
+ self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets()
except Exception as e:
logger.info(e)
raise e
@@ -297,14 +447,14 @@ class MainWindow(QMainWindow):
if self._cameras_are_popped_out:
self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setText(
- "Re-dock cameras"
+ "Dock cameras"
)
else:
self._control_panel.camera_setup_control_panel.pop_out_cameras_button.setText(
"Pop out cameras"
)
- self._camera_view_panel.camera_stream_grid_view.create_and_start_camera_widgets(
+ self._middle_viewing_panel.camera_stream_grid_view.create_and_start_camera_widgets(
dictionary_of_webcam_configs=dictionary_of_webcam_configs,
pop_out_camera_windows=pop_out_camera_windows,
)
@@ -318,14 +468,14 @@ class MainWindow(QMainWindow):
def _start_recording_videos(self, panel):
panel.change_button_states_on_record_start()
- self._camera_view_panel.camera_stream_grid_view.start_recording_videos()
+ self._middle_viewing_panel.camera_stream_grid_view.start_recording_videos()
def _stop_recording_videos(self, panel, calibration_videos=False):
panel.change_button_states_on_record_stop()
- self._camera_view_panel.camera_stream_grid_view.stop_recording_videos()
+ self._middle_viewing_panel.camera_stream_grid_view.stop_recording_videos()
dictionary_of_video_recorders = (
- self._camera_view_panel.camera_stream_grid_view.gather_video_recorders()
+ self._middle_viewing_panel.camera_stream_grid_view.gather_video_recorders()
)
if calibration_videos:
@@ -342,11 +492,11 @@ class MainWindow(QMainWindow):
)
def _handle_videos_saved_signal(self, calibration_videos: bool = False):
- self._camera_view_panel.camera_stream_grid_view.reset_video_recorders()
+ self._middle_viewing_panel.camera_stream_grid_view.reset_video_recorders()
if calibration_videos:
if (
- self._control_panel._calibrate_capture_volume_panel.process_recording_automatically_checkbox.isChecked()
+ self._control_panel.calibrate_capture_volume_panel.process_recording_automatically_checkbox.isChecked()
):
self._setup_and_launch_anipose_calibration_thread_worker()
else: # mocap videos
@@ -431,20 +581,72 @@ class MainWindow(QMainWindow):
logger.info(f"Opening {Path(blender_file_path)}")
os.startfile(str(blender_file_path))
- def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
- logger.info("Close Event detected... ")
- self._camera_view_panel.camera_stream_grid_view.close_camera_widgets()
+ def _visualize_motion_capture_data(self):
+ logger.info(
+ "`self._control_panel.visualize_motion_capture_data.load_session_data_button` was pressed "
+ )
- try:
- log_file_path = get_log_file_path()
- session_log_path = (
- Path(get_session_folder_path(self._session_id)) / self._session_id
- + "log.log"
- )
- logger.info(
- f"Trying to copy log file from {log_file_path} to session folder: {session_log_path}..."
- )
- shutil.copy2(get_log_file_path(), get_session_folder_path(self._session_id))
- except Exception as e:
- logger.error(f"Something went wrong copying the log file")
- print(e)
+ skeleton_3d_npy = load_mediapipe3d_data(
+ get_output_data_folder_path(self._session_id)
+ )
+
+ video_path_iterator = Path(
+ get_annotated_videos_folder_path(self._session_id)
+ ).glob("*.mp4".lower())
+ list_of_video_paths = [str(video_path) for video_path in video_path_iterator]
+
+ dictionary_of_video_image_update_callbacks = (
+ self._middle_viewing_panel.dictionary_of_video_image_update_callbacks
+ )
+ self._middle_viewing_panel.show_session_playback_view(
+ mediapipe3d_trackedPoint_xyz=skeleton_3d_npy[0, :, :],
+ list_of_video_paths=list_of_video_paths,
+ )
+ self._thread_worker_manager.launch_session_playback_thread(
+ frames_per_second=30,
+ list_of_video_paths=list_of_video_paths,
+ dictionary_of_video_image_update_callbacks=dictionary_of_video_image_update_callbacks,
+ skeleton_3d_npy=skeleton_3d_npy,
+ update_3d_skeleton_callback=self._middle_viewing_panel.session_playback_view.update_3d_skeleton_callback,
+ )
+
+ def _reboot_gui(self):
+ logger.info("Rebooting GUI... ")
+ get_qt_app().exit(EXIT_CODE_REBOOT)
+
+ def closeEvent(self, a0: QtGui.QCloseEvent) -> None:
+ logger.info("Close Event detected for main window... ")
+ self._middle_viewing_panel.camera_stream_grid_view.close_camera_widgets()
+
+ if self._session_id is not None:
+ session_folder = get_session_folder_path(self._session_id)
+ dir = os.listdir(session_folder)
+ if len(dir) == 0:
+ logger.info(f"{self._session_id} folder is empty, so let's delete it")
+ Path(session_folder).rmdir()
+ return
+ else:
+ try:
+ session_log_path = (
+ str(
+ Path(get_session_folder_path(self._session_id))
+ / self._session_id
+ )
+ + "_log.log"
+ )
+ logger.info(
+ f"Trying to copy log file from {LOG_FILE_PATH} as session log file: {session_log_path}..."
+ )
+ shutil.copy2(
+ LOG_FILE_PATH, get_session_folder_path(self._session_id)
+ )
+ except Exception as e:
+ logger.error(f"Something went wrong copying the log file")
+ print(e)
+
+ # def _set_icon(self):
+ #
+ # icon = QtGui.QIcon()
+ # logo_path = "assets/logo/freemocap-skelly-logo-black-border-white-bkgd.png"
+ # icon.addPixmap(QtGui.QPixmap(logo_path), QtGui.QIcon.Selected, QtGui.QIcon.On)
+ # self.setWindowIcon(icon)
diff --git a/src/gui/main/main_window/middle_panel_viewers/__init__.py b/src/gui/main/main_window/middle_panel_viewers/__init__.py
new file mode 100644
index 00000000..e69de29b
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 0285b03f..6f2d7279 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,7 +1,7 @@
from typing import List, Dict, Callable
import numpy as np
-from PyQt6 import QtCore
+from PyQt6 import QtCore, QtGui
from PyQt6.QtCore import pyqtSignal
from PyQt6.QtWidgets import (
QWidget,
@@ -98,3 +98,6 @@ class CameraStreamGridView(QWidget):
def reset_video_recorders(self):
for camera_widget in self._dictionary_of_camera_widgets.values():
camera_widget.reset_video_recorder()
+
+ def hideEvent(self, a0: QtGui.QHideEvent) -> None:
+ self.close_camera_widgets()
diff --git a/src/gui/main/main_window/middle_panel_viewers/camera_view_panel.py b/src/gui/main/main_window/middle_panel_viewers/camera_view_panel.py
deleted file mode 100644
index 4ae14f6e..00000000
--- a/src/gui/main/main_window/middle_panel_viewers/camera_view_panel.py
+++ /dev/null
@@ -1,78 +0,0 @@
-import time
-
-from PyQt6 import QtCore
-from PyQt6.QtWidgets import (
- QFrame,
- QVBoxLayout,
- QWidget,
- QPushButton,
- QLabel,
- QSpacerItem,
-)
-
-from src.cameras.detection.models import FoundCamerasResponse
-from src.config.webcam_config import WebcamConfig
-
-from src.gui.main.main_window.middle_panel_viewers.camera_stream_grid_view import (
- CameraStreamGridView,
-)
-from src.gui.main.qt_utils.clear_layout import clear_layout
-from src.gui.main.styled_widgets.page_title import PageTitle
-from src.gui.main.workers.cam_detection_thread_worker import CameraDetectionThreadWorker
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class CameraViewPanel(QWidget):
- def __init__(self):
- super().__init__()
- self._frame = QFrame()
- self._frame.setFrameShape(QFrame.Shape.StyledPanel)
- self._layout = QVBoxLayout()
- self._frame.setLayout(self._layout)
-
- self._welcome_to_freemocap_title_widget = self._welcome_to_freemocap_title()
- self._layout.addWidget(self._welcome_to_freemocap_title_widget)
-
- self._camera_stream_grid_view = CameraStreamGridView()
-
- @property
- def frame(self):
- return self._frame
-
- @property
- def camera_stream_grid_view(self):
- return self._camera_stream_grid_view
-
- def _welcome_to_freemocap_title(self):
- # TO DO - this shouldn't be part of the `camera_view_panel` - it should be its own thing that gets swapped out on session start
- logger.info("Creating `welcome to freemocap` widget")
- welcome_widget = QWidget()
- layout = QVBoxLayout()
- welcome_widget.setLayout(layout)
-
- layout.addStretch()
-
- session_title_widget = PageTitle(
- "Welcome to FreeMoCap! \n \U00002728 \U0001F480 \U00002728 "
- )
- layout.addWidget(session_title_widget, QtCore.Qt.AlignCenter)
-
- alpha_version_text_str = "This is an *early* version of the `alpha` version of this software, so like - Manage your Expectations lol "
- layout.addWidget(QLabel(alpha_version_text_str), QtCore.Qt.AlignCenter)
-
- layout.addStretch()
-
- return welcome_widget
-
- def show_camera_streams(self):
-
- try:
- self._welcome_to_freemocap_title_widget.close()
- except:
- pass
-
- logger.info("Showing camera stream grid view")
- self._layout.addWidget(self._camera_stream_grid_view)
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/__init__.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py
new file mode 100644
index 00000000..f5b7f695
--- /dev/null
+++ b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/middle_viewing_panel.py
@@ -0,0 +1,87 @@
+from typing import List
+
+import numpy as np
+from PyQt6.QtWidgets import (
+ QFrame,
+ QVBoxLayout,
+ QWidget,
+)
+
+from src.gui.main.main_window.left_panel_controls.toolbox_widgets.welcome_create_or_load_new_session_panel import (
+ WelcomeCreateOrLoadNewSessionPanel,
+)
+
+from src.gui.main.main_window.middle_panel_viewers.camera_stream_grid_view import (
+ CameraStreamGridView,
+)
+from src.gui.main.main_window.middle_panel_viewers.session_playback_view.session_playback_view import (
+ SessionPlaybackView,
+)
+from src.gui.main.main_window.middle_panel_viewers.session_playback_view.video_playback_grid_view import (
+ VideoPlaybackGridView,
+)
+from src.gui.main.visualize_session.gl_3d_view_port import Gl3dViewPort
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class MiddleViewingPanel(QWidget):
+ def __init__(self):
+ super().__init__()
+ self._frame = QFrame()
+ self._frame.setFrameShape(QFrame.Shape.StyledPanel)
+ self._layout = QVBoxLayout()
+ self._frame.setLayout(self._layout)
+ self._welcome_create_or_load_session_panel = (
+ WelcomeCreateOrLoadNewSessionPanel()
+ )
+ self._layout.addWidget(self._welcome_create_or_load_session_panel)
+
+ self._camera_stream_grid_view = CameraStreamGridView()
+ self._camera_stream_grid_view.hide()
+
+ self._layout.addWidget(self._camera_stream_grid_view)
+
+ self._session_playback_view = SessionPlaybackView()
+ self._session_playback_view.hide()
+
+ self._layout.addWidget(self._session_playback_view)
+
+ @property
+ def frame(self):
+ return self._frame
+
+ @property
+ def welcome_create_or_load_session_panel(self):
+ return self._welcome_create_or_load_session_panel
+
+ @property
+ def camera_stream_grid_view(self):
+ return self._camera_stream_grid_view
+
+ @property
+ def session_playback_view(self):
+ return self._session_playback_view
+
+ @property
+ def dictionary_of_video_image_update_callbacks(self):
+ return self._session_playback_view.dictionary_of_video_image_update_callbacks
+
+ def show_camera_streams(self):
+ logger.info("Showing camera stream grid view")
+ self._welcome_create_or_load_session_panel.hide()
+ self._camera_stream_grid_view.show()
+
+ def show_session_playback_view(
+ self, list_of_video_paths: List, mediapipe3d_trackedPoint_xyz: np.ndarray
+ ):
+ self._session_playback_view.initialize_video_playback_grid(
+ list_of_video_paths=list_of_video_paths,
+ )
+ self._session_playback_view.initialize_skeleton_view(
+ mediapipe3d_trackedPoint_xyz=mediapipe3d_trackedPoint_xyz
+ )
+ self._camera_stream_grid_view.hide()
+ self._session_playback_view.show()
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/session_playback_view.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/session_playback_view.py
new file mode 100644
index 00000000..82a091e2
--- /dev/null
+++ b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/session_playback_view.py
@@ -0,0 +1,45 @@
+import logging
+from typing import List
+
+import numpy as np
+from PyQt6.QtWidgets import QWidget, QVBoxLayout
+
+from src.gui.main.main_window.middle_panel_viewers.session_playback_view.video_playback_grid_view import (
+ VideoPlaybackGridView,
+)
+from src.gui.main.visualize_session.gl_3d_view_port import Gl3dViewPort
+
+logger = logging.getLogger(__name__)
+
+
+class SessionPlaybackView(QWidget):
+ def __init__(self):
+ super().__init__()
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._video_playback_grid_view = VideoPlaybackGridView()
+ self._layout.addWidget(self._video_playback_grid_view)
+
+ self._gl_3d_view_port_widget = Gl3dViewPort()
+ self._layout.addWidget(self._gl_3d_view_port_widget)
+
+ @property
+ def dictionary_of_video_image_update_callbacks(self):
+ return self._video_playback_grid_view.dictionary_video_image_update_callbacks
+
+ @property
+ def update_3d_skeleton_callback(self):
+ return self._gl_3d_view_port_widget.update_mediapipe3d_skeleton
+
+ def initialize_video_playback_grid(self, list_of_video_paths: List):
+ logger.info("Showing video playback grid")
+ self._video_playback_grid_view.create_video_widgets(
+ list_of_video_paths=list_of_video_paths
+ )
+
+ def initialize_skeleton_view(self, mediapipe3d_trackedPoint_xyz: np.ndarray):
+ self._gl_3d_view_port_widget.initialize_mediapipe_3d_skeleton(
+ mediapipe3d_trackedPoint_xyz=mediapipe3d_trackedPoint_xyz
+ )
diff --git a/src/gui/main/main_window/middle_panel_viewers/session_playback_view/video_playback_grid_view.py b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/video_playback_grid_view.py
new file mode 100644
index 00000000..c570e84e
--- /dev/null
+++ b/src/gui/main/main_window/middle_panel_viewers/session_playback_view/video_playback_grid_view.py
@@ -0,0 +1,64 @@
+from pathlib import Path
+from typing import List, Dict, Callable
+
+import numpy as np
+from PyQt6 import QtCore
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtWidgets import (
+ QWidget,
+ QGridLayout,
+ QVBoxLayout,
+ QLabel,
+ QDockWidget,
+ QPushButton,
+ QHBoxLayout,
+)
+
+from src.cameras.detection.models import FoundCamerasResponse
+from src.cameras.save_synchronized_videos import save_synchronized_videos
+from src.config.webcam_config import WebcamConfig
+from src.gui.main.app_state.app_state import APP_STATE
+from src.gui.main.custom_widgets.single_camera_widget import SingleCameraWidget
+from src.gui.main.custom_widgets.video_player_widget import VideoPlayerWidget
+from src.gui.main.qt_utils.clear_layout import clear_layout
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class VideoPlaybackGridView(QWidget):
+ def __init__(self):
+ super().__init__()
+
+ self._layout = QHBoxLayout()
+ self.setLayout(self._layout)
+
+ self._dictionary_of_video_widgets = {}
+
+ self._dictionary_of_video_image_update_callbacks = {}
+
+ @property
+ def dictionary_video_image_update_callbacks(self):
+ return self._dictionary_of_video_image_update_callbacks
+
+ def create_video_widgets(
+ self,
+ list_of_video_paths: List,
+ ):
+ clear_layout(self._layout)
+ logger.info("Creating video widgets...")
+
+ for video_path in list_of_video_paths:
+ video_name = Path(video_path).stem
+ video_widget = VideoPlayerWidget()
+ self._dictionary_of_video_widgets[video_name] = video_widget
+
+ video_layout = QVBoxLayout()
+ video_layout.addWidget(QLabel(f"{video_name}"))
+ video_layout.addWidget(video_widget)
+ self._layout.addLayout(video_layout)
+
+ self._dictionary_of_video_image_update_callbacks[
+ video_name
+ ] = video_widget.update_image
diff --git a/src/gui/main/main_window/right_side_panel/__init__.py b/src/gui/main/main_window/right_side_panel/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/gui/main/main_window/right_side_panel/file_system_view_widget.py b/src/gui/main/main_window/right_side_panel/file_system_view_widget.py
index 3da75b31..ac3e2b4a 100644
--- a/src/gui/main/main_window/right_side_panel/file_system_view_widget.py
+++ b/src/gui/main/main_window/right_side_panel/file_system_view_widget.py
@@ -5,7 +5,7 @@ from typing import Union
from PyQt6.QtCore import Qt, pyqtSignal
from PyQt6.QtGui import QFileSystemModel
-from PyQt6.QtWidgets import QWidget, QTreeView, QVBoxLayout, QMenu
+from PyQt6.QtWidgets import QWidget, QTreeView, QVBoxLayout, QMenu, QPushButton
from qtpy import QtGui
from src.config.home_dir import get_freemocap_data_folder_path, get_session_folder_path
@@ -46,6 +46,25 @@ class FileSystemViewWidget(QWidget):
self.set_folder_view_to_freemocap_data_folder()
+ self._show_current_session_folder_button = QPushButton(
+ "Show Current Session Folder"
+ )
+ self._show_current_session_folder_button.setEnabled(False)
+ layout.addWidget(self._show_current_session_folder_button)
+
+ self._reset_folder_view_to_freemocap_data_folder_button = QPushButton(
+ "Show FreeMoCap Data folder"
+ )
+ self._reset_folder_view_to_freemocap_data_folder_button.setEnabled(True)
+ self._reset_folder_view_to_freemocap_data_folder_button.clicked.connect(
+ self.set_folder_view_to_freemocap_data_folder
+ )
+ layout.addWidget(self._reset_folder_view_to_freemocap_data_folder_button)
+
+ @property
+ def show_current_session_folder_button(self):
+ return self._show_current_session_folder_button
+
def set_folder_view_to_freemocap_data_folder(self):
logger.info(f"Setting root folder to {str(self._freemocap_data_folder_path)}")
self.set_folder_as_root(self._freemocap_data_folder_path)
diff --git a/src/gui/main/main_window/right_side_panel/right_side_panel.py b/src/gui/main/main_window/right_side_panel/right_side_panel.py
index 82ba104e..8f84bb5a 100644
--- a/src/gui/main/main_window/right_side_panel/right_side_panel.py
+++ b/src/gui/main/main_window/right_side_panel/right_side_panel.py
@@ -1,7 +1,7 @@
from pathlib import Path
from typing import Union
-from PyQt6.QtWidgets import QFrame, QVBoxLayout, QTabWidget
+from PyQt6.QtWidgets import QFrame, QVBoxLayout, QTabWidget, QPushButton
from src.gui.main.app import get_qt_app
from src.gui.main.main_window.right_side_panel.file_system_view_widget import (
@@ -12,15 +12,16 @@ from src.gui.main.main_window.right_side_panel.jupyter_console_widget import (
)
-class RightSidePanel:
+class RightSidePanel(QTabWidget):
def __init__(self, freemocap_data_folder_path: Union[str, Path]):
+ super().__init__()
self._frame = QFrame()
self._frame.setFrameShape(QFrame.Shape.StyledPanel)
- self._main_layout = QVBoxLayout()
- self._frame.setLayout(self._main_layout)
+ self._layout = QVBoxLayout()
+ self._frame.setLayout(self._layout)
self._file_viewer_tab_widget = QTabWidget()
- self._main_layout.addWidget(self._file_viewer_tab_widget)
+ self._layout.addWidget(self._file_viewer_tab_widget)
self._file_system_view_widget = FileSystemViewWidget(
freemocap_data_folder_path=freemocap_data_folder_path
@@ -30,7 +31,7 @@ class RightSidePanel:
)
self._log_and_console_tab_widget = QTabWidget()
- self._main_layout.addWidget(self._log_and_console_tab_widget)
+ self._layout.addWidget(self._log_and_console_tab_widget)
self._jupyter_console_widget = JupyterConsoleWidget()
self._log_and_console_tab_widget.addTab(
@@ -38,8 +39,6 @@ class RightSidePanel:
"iPython Jupyter Console",
)
- self._log_widget = self._create_log_widget()
-
@property
def frame(self):
return self._frame
diff --git a/src/gui/main/tool_tips/tool_tips.py b/src/gui/main/tool_tips/tool_tips_strings.py
similarity index 100%
rename from src/gui/main/tool_tips/tool_tips.py
rename to src/gui/main/tool_tips/tool_tips_strings.py
diff --git a/src/gui/main/visualize_session/gl_3d_view_port.py b/src/gui/main/visualize_session/gl_3d_view_port.py
new file mode 100644
index 00000000..3311b711
--- /dev/null
+++ b/src/gui/main/visualize_session/gl_3d_view_port.py
@@ -0,0 +1,129 @@
+import logging
+from typing import Union
+
+import numpy as np
+import pyqtgraph as pg
+import pyqtgraph.opengl as gl
+from PyQt6.QtWidgets import QWidget, QVBoxLayout
+from pyqtgraph.dockarea.Dock import Dock
+
+from src.core_processes.mediapipe_stuff.mediapipe_skeleton_names_and_connections import (
+ mediapipe_body_connections,
+)
+from src.pipelines.session_pipeline.data_classes.data_3d_single_frame_payload import (
+ Data3dMultiFramePayload,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class Gl3dViewPort(QWidget):
+ def __init__(self):
+ logger.info("setting up Visualizer3d")
+ super().__init__()
+
+ self._base_scalar = 2e3 # 2 meters, probably
+ self._frame_number = -1
+
+ self._mediapipe_connections_dict = {}
+ self._mediapipe_skeleton_scatter_item = None
+ self._mediapipe_body_connections = mediapipe_body_connections
+
+ self._layout = QVBoxLayout()
+ self.setLayout(self._layout)
+
+ self._opengl_3d_plot_widget = gl.GLViewWidget()
+ self._setup_3d_view(initial_viewing_distance=self._base_scalar)
+ self._layout.addWidget(self._opengl_3d_plot_widget)
+
+ def _setup_3d_view(self, initial_viewing_distance: Union[float, int] = 2e3):
+ self._opengl_3d_plot_widget.opts["distance"] = initial_viewing_distance
+ self._create_grid_planes(grid_scale=initial_viewing_distance)
+ self._create_rgb_origin_axes()
+
+ def _create_rgb_origin_axes(self):
+ # create XYZ axes
+ x_axis_line_array = np.array([[0, 0, 0], [100, 0, 0]])
+ y_axis_line_array = np.array([[0, 0, 0], [0, 100, 0]])
+ z_axis_line_array = np.array([[0, 0, 0], [0, 0, 100]])
+
+ self.origin_x_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
+ pos=x_axis_line_array, color=(1, 0, 0, 1), width=1.0, antialias=True
+ )
+ self.origin_y_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
+ pos=y_axis_line_array, color=(0, 1, 0, 1), width=1.0, antialias=True
+ )
+ self.origin_z_axis_gl_lineplot_item = pg.opengl.GLLinePlotItem(
+ pos=z_axis_line_array, color=(0, 0, 1, 1), width=1.0, antialias=True
+ )
+ self._opengl_3d_plot_widget.addItem(self.origin_x_axis_gl_lineplot_item)
+ self._opengl_3d_plot_widget.addItem(self.origin_y_axis_gl_lineplot_item)
+ self._opengl_3d_plot_widget.addItem(self.origin_z_axis_gl_lineplot_item)
+
+ def _create_grid_planes(self, grid_scale: Union[int, float] = 2e3):
+
+ # create the background grids
+ grid_plane_x = gl.GLGridItem()
+ grid_plane_x.setSize(grid_scale, grid_scale, grid_scale)
+ grid_plane_x.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
+ grid_plane_x.rotate(90, 0, 1, 0)
+ grid_plane_x.translate(-grid_scale, 0, 0)
+ self._opengl_3d_plot_widget.addItem(grid_plane_x)
+
+ grid_plane_y = gl.GLGridItem()
+ grid_plane_y.setSize(grid_scale, grid_scale, grid_scale)
+ grid_plane_y.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
+ grid_plane_y.rotate(90, 1, 0, 0)
+ grid_plane_y.translate(0, -grid_scale, 0)
+ self._opengl_3d_plot_widget.addItem(grid_plane_y)
+
+ grid_plane_z = gl.GLGridItem()
+ grid_plane_z.setSize(grid_scale, grid_scale, grid_scale)
+ grid_plane_z.setSpacing(grid_scale / 10, grid_scale / 10, grid_scale / 10)
+ grid_plane_z.translate(0, 0, -grid_scale)
+ self._opengl_3d_plot_widget.addItem(grid_plane_z)
+
+ def _initialize_mediapipe_skeleton_dottos(
+ self, mediapipe3d_trackedPoint_xyz: np.ndarray
+ ):
+ self._mediapipe_skeleton_scatter_item = gl.GLScatterPlotItem(
+ pos=mediapipe3d_trackedPoint_xyz,
+ color=(0, 1, 1, 1),
+ size=10,
+ pxMode=False,
+ )
+ self._opengl_3d_plot_widget.addItem(self._mediapipe_skeleton_scatter_item)
+
+ def _initialize_mediapipe_skeleton_connections(
+ self, mediapipe3d_trackedPoint_xyz: np.ndarray
+ ):
+ self._skeleton_connections_list = []
+ for this_connection in self._mediapipe_body_connections:
+ this_skel_line = gl.GLLinePlotItem(
+ pos=mediapipe3d_trackedPoint_xyz[this_connection, :]
+ )
+ self._skeleton_connections_list.append(this_skel_line)
+ self._opengl_3d_plot_widget.addItem(this_skel_line)
+
+ def initialize_mediapipe_3d_skeleton(
+ self, mediapipe3d_trackedPoint_xyz: np.ndarray
+ ):
+
+ self._initialize_mediapipe_skeleton_dottos(mediapipe3d_trackedPoint_xyz)
+ self._initialize_mediapipe_skeleton_connections(mediapipe3d_trackedPoint_xyz)
+
+ def update_mediapipe3d_skeleton(self, mediapipe3d_trackedPoint_xyz: np.ndarray):
+ print("helloough892y 89yu23roo")
+
+ # update skel dottos
+ self._mediapipe_skeleton_scatter_item.setData(
+ pos=mediapipe3d_trackedPoint_xyz,
+ )
+
+ # update skel lines
+ for this_skeleton_line_number, this_connection in enumerate(
+ self._mediapipe_body_connections
+ ):
+ self._skeleton_connections_list[this_skeleton_line_number].setData(
+ pos=mediapipe3d_trackedPoint_xyz[this_connection, :]
+ )
diff --git a/src/gui/main/workers/cam_detection_thread_worker.py b/src/gui/main/workers/cam_detection_thread_worker.py
index df57ab6f..cf4aab85 100644
--- a/src/gui/main/workers/cam_detection_thread_worker.py
+++ b/src/gui/main/workers/cam_detection_thread_worker.py
@@ -13,7 +13,6 @@ class CameraDetectionThreadWorker(QThread):
def __init__(self):
super().__init__()
- self.finished.connect(self.quit)
def run(self):
logger.info("Detecting cameras....")
diff --git a/src/gui/main/workers/mediapipe_2d_detection_thread_worker.py b/src/gui/main/workers/mediapipe_2d_detection_thread_worker.py
index 500bbad2..0a8217e5 100644
--- a/src/gui/main/workers/mediapipe_2d_detection_thread_worker.py
+++ b/src/gui/main/workers/mediapipe_2d_detection_thread_worker.py
@@ -6,7 +6,7 @@ from PyQt6.QtCore import QThread, pyqtSignal
import logging
-from src.core_processes.mediapipe_2d_skeleton_detector.mediapipe_skeleton_detector import (
+from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
MediaPipeSkeletonDetector,
)
diff --git a/src/gui/main/workers/session_playback_thread_worker.py b/src/gui/main/workers/session_playback_thread_worker.py
new file mode 100644
index 00000000..111773a5
--- /dev/null
+++ b/src/gui/main/workers/session_playback_thread_worker.py
@@ -0,0 +1,104 @@
+import time
+from pathlib import Path
+from typing import Union, Callable, List, Dict
+
+import cv2
+import numpy as np
+from PyQt6.QtCore import QThread, pyqtSignal, QTimer
+
+from src.cameras.detection.cam_singleton import get_or_create_cams
+from src.cameras.detection.models import FoundCamerasResponse
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class SessionPlaybackThreadWorker(QThread):
+ def __init__(
+ self,
+ frames_per_second: Union[int, float],
+ list_of_video_paths: List[Union[str, Path]],
+ dictionary_of_video_image_update_callbacks: Dict[str, Callable],
+ skeleton_3d_npy: np.ndarray,
+ update_3d_skeleton_callback: Callable,
+ ):
+ super().__init__()
+ self._frame_duration = frames_per_second**-1
+ self._list_of_video_paths = list_of_video_paths
+ self._dictionary_of_video_image_update_callbacks = (
+ dictionary_of_video_image_update_callbacks
+ )
+
+ self._skeleton_3d_frame_trackedPoint_dimension = skeleton_3d_npy
+ self._update_3d_skeleton_callback = update_3d_skeleton_callback
+
+ self._should_continue = True
+
+ @property
+ def should_continue(self):
+ return self._should_continue
+
+ @should_continue.setter
+ def should_continue(self, set: bool):
+ self._should_continue = set
+
+ def _create_video_capture_dictionary(self):
+ video_capture_object_dict = {}
+ for video_path in self._list_of_video_paths:
+ video_name = Path(video_path).stem
+ video_capture_object_dict[video_name] = cv2.VideoCapture(str(video_path))
+
+ return video_capture_object_dict
+
+ def run(self):
+ logger.info(
+ f"Starting session_playback_thread_worker with frame_duration set to {self._frame_duration:.4f} seconds"
+ )
+ self._video_capture_object_dict = self._create_video_capture_dictionary()
+ last_update_time = time.perf_counter()
+ frame_number = -1
+ reset_frame_number = False
+
+ number_of_frames = list(self._video_capture_object_dict.values())[0].get(
+ cv2.CAP_PROP_FRAME_COUNT
+ )
+
+ while self._should_continue:
+ current_time = time.perf_counter()
+
+ if current_time - last_update_time > self._frame_duration:
+ last_update_time = current_time
+ frame_number += 1
+ if frame_number >= number_of_frames:
+ frame_number = 0
+
+ reset_frame_number = True
+ self._update_video_images(frame_number=frame_number)
+ self._update_skeleton(frame_number=frame_number)
+
+ def _update_video_images(self, frame_number: int):
+
+ # update videos
+ for (
+ video_name,
+ video_update,
+ ) in self._dictionary_of_video_image_update_callbacks.items():
+ if frame_number == 0:
+ self._video_capture_object_dict[video_name].set(
+ cv2.CAP_PROP_POS_FRAMES, 0
+ )
+ success, image = self._video_capture_object_dict[video_name].read()
+ if not success:
+ logger.error(f"Failed to read a frame from video : {video_name}")
+ raise Exception
+
+ video_update(image)
+
+ def _update_skeleton(self, frame_number: int):
+ print(f"skrelelton frame_number: {frame_number}")
+
+ this_frame_skeleton_data = self._skeleton_3d_frame_trackedPoint_dimension[
+ frame_number, :, :
+ ]
+ self._update_3d_skeleton_callback(this_frame_skeleton_data)
diff --git a/src/gui/main/workers/thread_worker_manager.py b/src/gui/main/workers/thread_worker_manager.py
index 5bc23496..2dc579f7 100644
--- a/src/gui/main/workers/thread_worker_manager.py
+++ b/src/gui/main/workers/thread_worker_manager.py
@@ -1,5 +1,5 @@
from pathlib import Path
-from typing import Dict, Union, Callable
+from typing import Dict, Union, Callable, List
import numpy as np
from PyQt6.QtCore import pyqtSignal
@@ -19,6 +19,9 @@ from src.gui.main.workers.mediapipe_2d_detection_thread_worker import (
Mediapipe2dDetectionThreadWorker,
)
from src.gui.main.workers.save_to_video_thread_worker import SaveToVideoThreadWorker
+from src.gui.main.workers.session_playback_thread_worker import (
+ SessionPlaybackThreadWorker,
+)
from src.gui.main.workers.triangulate_3d_data_thread_worker import (
Triangulate3dDataThreadWorker,
)
@@ -136,3 +139,23 @@ class ThreadWorkerManager(QWidget):
# self.blender_file_created_signal.emit
# )
# self._export_to_blender_thread_worker.start()
+
+ def launch_session_playback_thread(
+ self,
+ frames_per_second: Union[int, float],
+ list_of_video_paths: List[Union[str, Path]],
+ dictionary_of_video_image_update_callbacks: Dict[str, Callable],
+ skeleton_3d_npy: np.ndarray,
+ update_3d_skeleton_callback: Callable,
+ ):
+ logger.info(
+ f"Launching `session_playback_thread_worker` with frames_per_second set to {frames_per_second} "
+ )
+ self._session_playback_viewer_thread_worker = SessionPlaybackThreadWorker(
+ frames_per_second=frames_per_second,
+ list_of_video_paths=list_of_video_paths,
+ dictionary_of_video_image_update_callbacks=dictionary_of_video_image_update_callbacks,
+ skeleton_3d_npy=skeleton_3d_npy,
+ update_3d_skeleton_callback=update_3d_skeleton_callback,
+ )
+ self._session_playback_viewer_thread_worker.start()
diff --git a/src/gui/workflow_helper_blurbs/camera_setup_control_panel_help_blurb.py b/src/gui/workflow_helper_blurbs/camera_setup_control_panel_help_blurb.py
new file mode 100644
index 00000000..0949195b
--- /dev/null
+++ b/src/gui/workflow_helper_blurbs/camera_setup_control_panel_help_blurb.py
@@ -0,0 +1 @@
+camera_setup_control_panel_help_blurb_str = "Choose which cameras you want to use, adjust the settings so that the images look good. When you're satisfied, go to the 'Calibrate Capture Volume' panel. \n For details click here [link to something]"
diff --git a/src/log/config.py b/src/log/config.py
index ca597a47..aa057de7 100644
--- a/src/log/config.py
+++ b/src/log/config.py
@@ -7,6 +7,8 @@ from src.config.home_dir import get_log_file_path
DEFAULT_LOGGING = {"version": 1, "disable_existing_loggers": False}
+LOG_FILE_PATH = None
+
def get_logging_handlers():
"""
@@ -29,8 +31,9 @@ def get_logging_handlers():
console_handler.setFormatter(default_formatter)
# Setup File handler (from https://stackoverflow.com/a/24507130/14662833 )
- log_file_path = get_log_file_path()
- file_handler = logging.FileHandler(log_file_path)
+ global LOG_FILE_PATH
+ LOG_FILE_PATH = get_log_file_path()
+ file_handler = logging.FileHandler(LOG_FILE_PATH)
file_handler.setFormatter(default_formatter)
file_handler.setLevel(logging.DEBUG)
diff --git a/src/pipelines/session_pipeline/session_pipeline_orchestrator.py b/src/pipelines/session_pipeline/session_pipeline_orchestrator.py
index ca0eba35..4c43e414 100644
--- a/src/pipelines/session_pipeline/session_pipeline_orchestrator.py
+++ b/src/pipelines/session_pipeline/session_pipeline_orchestrator.py
@@ -14,7 +14,7 @@ from src.config.home_dir import (
get_most_recent_session_id,
get_output_data_folder_path,
)
-from src.core_processes.mediapipe_2d_skeleton_detector.mediapipe_skeleton_detector import (
+from src.core_processes.mediapipe_stuff.mediapipe_skeleton_detector import (
MediaPipeSkeletonDetector,
Mediapipe2dDataPayload,
)