Free Motion Capture for Everyone πβ¨
TypeScript
Jon/manually align skeleton (#270)
jonmatthiscbf5c720ec3d
diff --git a/ipython_jupyter_notebooks/rotate_translate_skeleton.ipynb b/ipython_jupyter_notebooks/rotate_translate_skeleton.ipynbnew file mode 100644index 00000000..bee115c4--- /dev/null+++ b/ipython_jupyter_notebooks/rotate_translate_skeleton.ipynb@@ -0,0 +1,333 @@+{+ "cells": [+ {+ "cell_type": "code",+ "execution_count": 6,+ "metadata": {+ "collapsed": true,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "import numpy as np\n",+ "import pandas as pd\n",+ "from pathlib import Path\n",+ "from mediapipe.python.solutions import holistic as mp_holistic"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "#load original skeleton / center_of_mass data\n",+ "session_path = Path(r\"D:\\Dropbox\\FreeMoCapProject\\FreeMocap_Data\\sesh_2022-11-09_20_38_23_neurons_demo\")\n",+ "output_data_path = session_path / \"DataArrays\"\n",+ "og_skeleton_npy_file_name = \"mediapipe_body_3d_xyz.npy\"\n",+ "og_skeleton_npy_path = output_data_path / og_skeleton_npy_file_name\n",+ "\n",+ "original_skeleton_frame_marker_xyz = np.load(og_skeleton_npy_path) / 1000 #convert to meters (b/c that's Blender's unit, which is where we got the transformation matrix)\n",+ "number_of_frames = original_skeleton_frame_marker_xyz.shape[0]\n",+ "number_of_markers = original_skeleton_frame_marker_xyz.shape[1]\n",+ "\n",+ "# load center_of_mass data\n",+ "og_center_of_mass_npy_file_name = \"totalBodyCOM_frame_XYZ.npy\"\n",+ "original_center_of_mass_xyz = np.load(output_data_path / og_center_of_mass_npy_file_name) / 1000"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "#to get this data,\n",+ "# - open `.blend` file (or run `src/blender_stuff/load_npy_as_empties.py`),\n",+ "# - rotate skeleton until it looks good, then ... \n",+ "# - enter `bpy.data.objects['freemocap_origin_axes'].matrix_world` into console\n",+ "# - copy the output into the `transformation_matrix` variable below (changing ()'s to []'s)\n",+ "\n",+ "transformation_matrix = \\\n",+ "[[0.8891741633415222, -0.4202311933040619, -0.181038960814476, 0.07594677060842514],\n",+ "[0.40811246633529663, 0.9072690606117249, -0.10152354836463928, 0.0],\n",+ "[0.20691442489624023, 0.016387859359383583, 0.9782217741012573, 0.14920693635940552],\n",+ "[0.0, 0.0, 0.0, 1.0]]"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "transformed_skeleton_frame_marker_xyz = np.zeros_like(original_skeleton_frame_marker_xyz)\n",+ "transformed_center_of_mass_frame_xyz = np.zeros((number_of_frames, 3))\n",+ "\n",+ "for frame_number in range(number_of_frames):\n",+ " \n",+ " transformed_com_xyzw = transformation_matrix @ np.append(original_center_of_mass_xyz[frame_number], 1)\n",+ " transformed_center_of_mass_frame_xyz[frame_number] = transformed_com_xyzw[:3]\n",+ "\n",+ " for marker_number in range(number_of_markers):\n",+ " point_xyz = original_skeleton_frame_marker_xyz[frame_number, marker_number, :]\n",+ " point_xyzw = np.append(point_xyz, 1)\n",+ " transformed_point_xyzw = transformation_matrix @ point_xyzw\n",+ " transformed_point_xyz = transformed_point_xyzw[:3]\n",+ " transformed_skeleton_frame_marker_xyz[frame_number, marker_number, : ] = transformed_point_xyz\n",+ "\n",+ "print(f\"transformed_skeleton_frame_marker_xyz.shape: {transformed_skeleton_frame_marker_xyz.shape}\")\n",+ "\n",+ "#convert back to mm\n",+ "original_skeleton_frame_marker_xyz *= 1000\n",+ "original_center_of_mass_xyz *= 1000\n",+ "\n",+ "transformed_skeleton_frame_marker_xyz*= 1000\n",+ "transformed_center_of_mass_frame_xyz *= 1000\n",+ "\n",+ "\n",+ "np.save(output_data_path / \"mediapipe_body_3d_xyz_transformed.npy\", transformed_skeleton_frame_marker_xyz)"+ ]+ },+ {+ "cell_type": "markdown",+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%% md\n"+ }+ },+ "source": [+ "# Now we test if it works by plotting COM projection onto XZ (ground) plane relative to the base of support (i.e. the right toe and heel markers)"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "import matplotlib.pyplot as plt\n"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "# get_relevant marker data out\n",+ "mediapipe_body_landmark_names = [\n",+ " landmark.name.lower() for landmark in mp_holistic.PoseLandmark\n",+ "]\n",+ "\n",+ "# original data\n",+ "original_right_heel_x = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_heel\"),0]\n",+ "original_right_heel_y = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_heel\"),1]\n",+ "original_right_heel_z = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_heel\"),2]\n",+ "\n",+ "original_right_toe_x = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_foot_index\"),0]\n",+ "original_right_toe_y = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_foot_index\"),1]\n",+ "original_right_toe_z = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_foot_index\"),2]\n",+ "\n",+ "original_left_heel_x = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_heel\"),0]\n",+ "original_left_heel_y = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_heel\"),1]\n",+ "original_left_heel_z = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_heel\"),2]\n",+ "\n",+ "original_left_toe_x = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_foot_index\"),0]\n",+ "original_left_toe_y = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_foot_index\"),1]\n",+ "original_left_toe_z = original_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_foot_index\"),2]\n",+ "\n",+ "\n",+ "# transformed data\n",+ "transformed_right_heel_x = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_heel\"),0]\n",+ "transformed_right_heel_y = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_heel\"),1]\n",+ "transformed_right_heel_z = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_heel\"),2]\n",+ "\n",+ "transformed_right_toe_x = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_foot_index\"),0]\n",+ "transformed_right_toe_y = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_foot_index\"),1]\n",+ "transformed_right_toe_z = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"right_foot_index\"),2]\n",+ "\n",+ "transformed_left_heel_x = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_heel\"),0]\n",+ "transformed_left_heel_y = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_heel\"),1]\n",+ "transformed_left_heel_z = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_heel\"),2]\n",+ "\n",+ "transformed_left_toe_x = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_foot_index\"),0]\n",+ "transformed_left_toe_y = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_foot_index\"),1]\n",+ "transformed_left_toe_z = transformed_skeleton_frame_marker_xyz[:, mediapipe_body_landmark_names.index(\"left_foot_index\"),2]\n"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "\n"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "# check via bos/com\n",+ "#identify relevant frames\n",+ "standing_on_right_foot_frame_start = 431 #watched the output `mp4` for frame numbers\n",+ "standing_on_right_foot_frame_end = 470\n",+ "frames_of_interest = np.arange(standing_on_right_foot_frame_start, standing_on_right_foot_frame_end)\n"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": [+ "\n",+ "def normalize_axes_2d(axis):\n",+ " x_range = axis.get_xlim()[1] - axis.get_xlim()[0]\n",+ " y_range = axis.get_ylim()[1] - axis.get_ylim()[0]\n",+ " \n",+ " if x_range > y_range:\n",+ " axis.set_ylim(axis.get_ylim()[0], axis.get_ylim()[0] + x_range)\n",+ " else:\n",+ " axis.set_xlim(axis.get_xlim()[0], axis.get_xlim()[0] + y_range)\n",+ " return axis\n",+ "\n",+ "figure = plt.figure(figsize=(10,10))\n",+ "\n",+ "## plot original data (Time series)\n",+ "ax1 = figure.add_subplot(221)\n",+ "ax1.set_title(\"Original data - timeseries\")\n",+ "ax1.plot(original_right_heel_x, label=\"original right heel x\")\n",+ "ax1.plot(original_right_heel_y, label=\"original right heel y\")\n",+ "ax1.plot(original_right_heel_z, label=\"original right heel z\")\n",+ "ax1.legend()\n",+ "\n",+ "\n",+ "## plot original data (on XZ (ground) plane)\n",+ "ax2 = figure.add_subplot(222)\n",+ "ax2.set_title(\"Original data - center of mass vs base of support\")\n",+ "ax2.plot(original_right_toe_x[frames_of_interest], original_right_toe_y[frames_of_interest], '.-', label=\"original right toe\", color=\"darkred\")\n",+ "ax2.plot(original_right_heel_x[frames_of_interest], original_right_heel_y[frames_of_interest], 'o-', label=\"original right heel\", color=\"darkred\")\n",+ "\n",+ "ax2.plot(original_left_toe_x[frames_of_interest], original_left_toe_y[frames_of_interest], '.-', label=\"original left toe\", color=\"darkblue\")\n",+ "ax2.plot(original_left_heel_x[frames_of_interest], original_left_heel_y[frames_of_interest], 'o-', label=\"original left heel\", color=\"darkblue\")\n",+ "\n",+ "ax2.plot(com_x[frames_of_interest], com_y[frames_of_interest], 'o-', label=\"center of mass\", color=\"xkcd:dark sea green\")\n",+ "\n",+ "ax2 = normalize_axes_2d(ax2)\n",+ "ax2.legend()\n",+ "\n",+ "\n",+ "## plot transformed data (Time series)\n",+ "ax3 = figure.add_subplot(223)\n",+ "ax3.set_title(\"Transformed data - timeseries\")\n",+ "ax3.plot(transformed_right_heel_x, label=\"transformed right heel x\")\n",+ "ax3.plot(transformed_right_heel_y, label=\"transformed right heel y\")\n",+ "ax3.plot(transformed_right_heel_z, label=\"transformed right heel z\")\n",+ "ax3.legend()\n",+ "\n",+ "## plot transformed data (on XZ (ground) plane)\n",+ "ax4 = figure.add_subplot(224)\n",+ "ax4.set_title(\"Transformed data - center of mass vs base of support\")\n",+ "ax4.plot(transformed_right_toe_x[frames_of_interest], transformed_right_toe_y[frames_of_interest], '.-', label=\"transformed right toe\", color=\"darkred\")\n",+ "ax4.plot(transformed_right_heel_x[frames_of_interest], transformed_right_heel_y[frames_of_interest], 'o-', label=\"transformed right heel\", color=\"darkred\")\n",+ "\n",+ "ax4.plot(transformed_left_toe_x[frames_of_interest], transformed_left_toe_y[frames_of_interest], '.-', label=\"transformed left toe\", color=\"darkblue\")\n",+ "ax4.plot(transformed_left_heel_x[frames_of_interest], transformed_left_heel_y[frames_of_interest], 'o-', label=\"transformed left heel\", color=\"darkblue\")\n",+ "\n",+ "ax4.plot(transformed_center_of_mass_frame_xyz[frames_of_interest,0], transformed_center_of_mass_frame_xyz[frames_of_interest,1], 'o-', label=\"center of mass\", color=\"xkcd:dark sea green\")\n",+ "\n",+ "ax4 = normalize_axes_2d(ax4)\n",+ "\n",+ "ax4.legend()\n",+ "\n",+ "\n",+ "plt.show()"+ ]+ },+ {+ "cell_type": "code",+ "execution_count": null,+ "metadata": {+ "collapsed": false,+ "pycharm": {+ "name": "#%%\n"+ }+ },+ "outputs": [],+ "source": []+ }+ ],+ "metadata": {+ "kernelspec": {+ "display_name": "Python 3.9.12 ('freemocap-endurance')",+ "language": "python",+ "name": "python3"+ },+ "language_info": {+ "codemirror_mode": {+ "name": "ipython",+ "version": 3+ },+ "file_extension": ".py",+ "mimetype": "text/x-python",+ "name": "python",+ "nbconvert_exporter": "python",+ "pygments_lexer": "ipython3",+ "version": "3.9.12"+ },+ "vscode": {+ "interpreter": {+ "hash": "13279345b754ebd3bebf437090ccc748537e92f8f2c3ba4d096a903b73831ba1"+ }+ }+ },+ "nbformat": 4,+ "nbformat_minor": 0+}diff --git a/src/blender_stuff/load_npy_as_empties.py b/src/blender_stuff/load_npy_as_empties.pynew file mode 100644index 00000000..23974b88--- /dev/null+++ b/src/blender_stuff/load_npy_as_empties.py@@ -0,0 +1,115 @@+import bpy+import numpy as np+from mathutils import Vector+from pathlib import Path++try:+ import pandas as pd+ import numpy as np+except:+ import sys+ import os+ import subprocess++ python_exe = os.path.join(sys.prefix, "bin", "python.exe")++ subprocess.call([python_exe, "-m", "ensurepip"])+ subprocess.call([python_exe, "-m", "pip", "install", "--upgrade", "pip"])+ subprocess.call([python_exe, "-m", "pip", "install", "--upgrade", "pandas"])+ subprocess.call([python_exe, "-m", "pip", "install", "--upgrade", "numpy"])+ import pandas as pd+ import numpy as np++mediapipe_body_trajectory_names = [+ "nose",+ "left_eye_inner",+ "left_eye",+ "left_eye_outer",+ "right_eye_inner",+ "right_eye",+ "right_eye_outer",+ "left_ear",+ "right_ear",+ "mouth_left",+ "mouth_right",+ "left_shoulder",+ "right_shoulder",+ "left_elbow",+ "right_elbow",+ "left_wrist",+ "right_wrist",+ "left_pinky",+ "right_pinky",+ "left_index",+ "right_index",+ "left_thumb",+ "right_thumb",+ "left_hip",+ "right_hip",+ "left_knee",+ "right_knee",+ "left_ankle",+ "right_ankle",+ "left_heel",+ "right_heel",+ "left_foot_index",+ "right_foot_index",+]+++def create_keyframed_empty_from_3d_trajectory_data(+ trajectory_fr_xyz: np.ndarray,+ parent_origin: bpy.types.Object = None,+ empty_scale: float = 0.0251,+ empty_type: str = "SPHERE",+ empty_name: str = None,+):+ """+ Create a key framed empty from 3d trajectory data+ """++ bpy.ops.object.empty_add(type=empty_type)+ empty_object = bpy.context.active_object++ empty_object.scale = [empty_scale] * 3++ if parent_origin is not None:+ empty_object.parent = parent_origin++ if empty_name is not None:+ empty_object.name = empty_name++ for frame_number in range(trajectory_fr_xyz.shape[0]):+ empty_object.location = [+ trajectory_fr_xyz[frame_number, 0],+ trajectory_fr_xyz[frame_number, 1],+ trajectory_fr_xyz[frame_number, 2],+ ]+ bpy.context.view_layer.update()++ empty_object.keyframe_insert(data_path="location", frame=frame_number)+++og_npy_path = "D:\Dropbox\FreeMoCapProject\FreeMocap_Data\sesh_2022-11-09_20_38_23_neurons_demo\DataArrays\mediapipe_body_3d_xyz_blender_rotated.npy"+og_skel = np.load(og_npy_path) / 1000+rot_skel = og_skel.copy()++# og_csv_path = "D:\Dropbox\FreeMoCapProject\FreeMocap_Data\sesh_2022-11-09_20_38_23_neurons_demo\DataArrays\mediapipe_body_3d_xyz.csv"+# of_skel_df = pd.read_csv(og_csv_path)+++bpy.ops.object.empty_add(type="ARROWS")+freemocap_axes = bpy.context.active_object+freemocap_axes.name = "freemocap_origin_axes" # will translate to put skelly on ground symmetric-ish about origin++for marker_name, marker_number in zip(+ mediapipe_body_trajectory_names, range(og_skel.shape[1])+):+ create_keyframed_empty_from_3d_trajectory_data(+ og_skel[:, marker_number, :],+ parent_origin=freemocap_axes,+ empty_name=marker_name,+ )+++bpy.context.scene.frame_end = og_skel.shape[0]diff --git a/src/config/home_dir.py b/src/config/home_dir.pyindex 0a645f29..d04039e4 100644--- a/src/config/home_dir.py+++ b/src/config/home_dir.py@@ -39,6 +39,7 @@ TOTAL_BODY_CENTER_OF_MASS_NPY_FILE_NAME = "total_body_center_of_mass_xyz.npy"MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME = "mediaPipeSkel_3d_origin_aligned.npy"+def create_default_session_id(string_tag: str = None):session_id = "session_" + time.strftime("%Y-%m-%d-%H_%M_%S")@@ -154,6 +155,7 @@ def get_raw_data_folder_path(session_id: str, create_folder: bool = True):raw_data_folder_path.mkdir(exist_ok=create_folder, parents=True)return str(raw_data_folder_path)+def get_session_calibration_toml_file_path(session_id: str) -> str:calibration_file_path = (Path(get_session_folder_path(session_id)) / CAMERA_CALIBRATION_FILE_NAMEdiff --git a/src/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py b/src/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.pyindex 3df2bf8a..0bd069fb 100644--- a/src/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py+++ b/src/core_processes/post_process_skeleton_data/gap_fill_filter_and_origin_align_skeleton_data.py@@ -1148,7 +1148,9 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(order: Union[float, int],reference_frame_number: Union[float, int] = None,):- path_to_folder_where_we_will_save_this_data = Path(path_to_folder_where_we_will_save_this_data)+ path_to_folder_where_we_will_save_this_data = Path(+ path_to_folder_where_we_will_save_this_data+ )logger.info("Gap-filling data...")# Interpolate the data@@ -1163,9 +1165,9 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(# pin skeleton to origin (set to mean positin of skeletonin this recording)zeroed_skeleton_data = butterworth_filtered_skeleton_data.copy()- zeroed_skeleton_data[:,:,0] -= np.nanmean(zeroed_skeleton_data[:,:,0])- zeroed_skeleton_data[:,:,1] -= np.nanmean(zeroed_skeleton_data[:,:,1])- zeroed_skeleton_data[:,:,2] -= np.nanmean(zeroed_skeleton_data[:,:,2])+ zeroed_skeleton_data[:, :, 0] -= np.nanmean(zeroed_skeleton_data[:, :, 0])+ zeroed_skeleton_data[:, :, 1] -= np.nanmean(zeroed_skeleton_data[:, :, 1])+ zeroed_skeleton_data[:, :, 2] -= np.nanmean(zeroed_skeleton_data[:, :, 2])# TODO - align skeleton so feet are at Z-plane and head is facing uporigin_aligned_freemocap_marker_data = zeroed_skeleton_data.copy()@@ -1201,9 +1203,7 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(# )logger.info("Saving Origin Aligned Data")- Path(path_to_folder_where_we_will_save_this_data).mkdir(- parents=True, exist_ok=True- )+ Path(path_to_folder_where_we_will_save_this_data).mkdir(parents=True, exist_ok=True)np.save(str(path_to_folder_where_we_will_save_this_data@@ -1230,9 +1230,9 @@ def gap_fill_filter_origin_align_3d_data_and_then_calculate_center_of_mass(skelcoordinates_frame_segment_joint_XYZ,anthropometric_info_dataframe,)- Path(path_to_folder_where_we_will_save_this_data / CENTER_OF_MASS_FOLDER_NAME).mkdir(- parents=True, exist_ok=True- )+ Path(+ path_to_folder_where_we_will_save_this_data / CENTER_OF_MASS_FOLDER_NAME+ ).mkdir(parents=True, exist_ok=True)np.save(str(path_to_folder_where_we_will_save_this_datadiff --git a/src/gui/main/main_window/main_window.py b/src/gui/main/main_window/main_window.pyindex d518fe60..ae08c2ca 100644--- a/src/gui/main/main_window/main_window.py+++ b/src/gui/main/main_window/main_window.py@@ -20,7 +20,9 @@ from src.config.home_dir import (get_freemocap_data_folder_path,get_annotated_videos_folder_path,get_skeleton_body_csv_path,- get_blender_file_path, get_raw_data_folder_path, PARTIALLY_PROCESSED_DATA_FOLDER_NAME,+ get_blender_file_path,+ get_raw_data_folder_path,+ PARTIALLY_PROCESSED_DATA_FOLDER_NAME,MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME,)from src.core_processes.capture_volume_calibration.charuco_board_detection.dataclasses.charuco_board_definition import (@@ -101,7 +103,9 @@ class MainWindow(QMainWindow):self._main_layout.addWidget(self._right_side_panel.frame)- self._thread_worker_manager = ThreadWorkerManager(session_progress_dictionary = self._pipedream_ping_dictionary )+ self._thread_worker_manager = ThreadWorkerManager(+ session_progress_dictionary=self._pipedream_ping_dictionary+ )# actions, signals and slots, o myself._create_actions()@@ -516,8 +520,6 @@ class MainWindow(QMainWindow):def _start_session(self, session_id: str, new_session: bool = False):--self._session_id = session_idself._control_panel.enable_toolbox_panels()self._set_session_folder_as_root_for_file_viewer(self._session_id)@@ -780,9 +782,9 @@ class MainWindow(QMainWindow):output_data_folder_path = Path(get_output_data_folder_path(self._session_id))mediapipe3d_xyz_file_path = (- Path(output_data_folder_path)- / PARTIALLY_PROCESSED_DATA_FOLDER_NAME- / MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME+ Path(output_data_folder_path)+ / PARTIALLY_PROCESSED_DATA_FOLDER_NAME+ / MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME)skel3d_frame_marker_xyz = load_post_processed_mediapipe3d_data(mediapipe3d_xyz_file_path@@ -842,10 +844,9 @@ class MainWindow(QMainWindow):)skeleton_3d_npy = load_post_processed_mediapipe3d_data(- Path(get_output_data_folder_path(self._session_id)) /- PARTIALLY_PROCESSED_DATA_FOLDER_NAME /- MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME-+ Path(get_output_data_folder_path(self._session_id))+ / PARTIALLY_PROCESSED_DATA_FOLDER_NAME+ / MEDIAPIPE_3D_ORIGIN_ALIGNED_NPY_FILE_NAME)video_path_iterator = Path(@@ -877,11 +878,13 @@ class MainWindow(QMainWindow):if (self._middle_viewing_panel.welcome_create_or_load_session_panel.send_pings_checkbox.isChecked()):- pipedream_ping_dict = self._thread_worker_manager.session_progress_dictionary+ pipedream_ping_dict = (+ self._thread_worker_manager.session_progress_dictionary+ )if Path(get_blender_file_path(self._session_id)).exists():- pipedream_ping_dict['blender_file_created'] = True+ pipedream_ping_dict["blender_file_created"] = Trueelse:- pipedream_ping_dict['blender_file_created'] = False+ pipedream_ping_dict["blender_file_created"] = Falsesend_pipedream_ping(pipedream_ping_dict)logger.info("Close Event detected for main window... ")diff --git a/src/gui/main/workers/thread_worker_manager.py b/src/gui/main/workers/thread_worker_manager.pyindex 5d495287..80d822b3 100644--- a/src/gui/main/workers/thread_worker_manager.py+++ b/src/gui/main/workers/thread_worker_manager.py@@ -60,7 +60,7 @@ class ThreadWorkerManager(QWidget):def launch_detect_cameras_worker(self):logger.info("Launching `Camera Detection` thread worker")- self._session_progress_dictionary["camera_detection"] = 'launched'+ self._session_progress_dictionary["camera_detection"] = "launched"self._camera_detection_thread_worker = CameraDetectionThreadWorker()self._camera_detection_thread_worker.finished.connect(@@ -68,7 +68,6 @@ class ThreadWorkerManager(QWidget):)self._camera_detection_thread_worker.start()-def launch_save_videos_thread_worker(self,folder_to_save_videos: Union[str, Path],@@ -78,10 +77,9 @@ class ThreadWorkerManager(QWidget):logger.info("Launching `Save Videos` thread worker...")if calibration_videos:- self._session_progress_dictionary["save_calibrate_videos"] = 'launched'+ self._session_progress_dictionary["save_calibrate_videos"] = "launched"else:- self._session_progress_dictionary["save_mocap_videos"] = 'launched'-+ self._session_progress_dictionary["save_mocap_videos"] = "launched"self._save_to_video_thread_worker = SaveToVideoThreadWorker(dictionary_of_video_recorders=dictionary_of_video_recorders,@@ -92,8 +90,6 @@ class ThreadWorkerManager(QWidget):lambda: self.videos_saved_signal.emit(calibration_videos))--def launch_anipose_calibration_thread_worker(self,charuco_board_definition: CharucoBoardDefinition,@@ -103,7 +99,7 @@ class ThreadWorkerManager(QWidget):jupyter_console_print_function_callable: Callable,):logger.info("Launching `Anipose (Charuco Board) Calibration` thread worker")- self._session_progress_dictionary["anipose_calibration"] = 'launched'+ self._session_progress_dictionary["anipose_calibration"] = "launched"self._anipose_calibration_worker = AniposeCalibrationThreadWorker(charuco_board_definition=charuco_board_definition,calibration_videos_folder_path=calibration_videos_folder_path,@@ -122,7 +118,7 @@ class ThreadWorkerManager(QWidget):auto_process_next_stage: bool = True,):logger.info("Launching `Detect Mediapipe 2d Skeleton` thread worker...")- self._session_progress_dictionary["medipipe"] = 'launched'+ self._session_progress_dictionary["medipipe"] = "launched"self._mediapipe_2d_detection_thread_worker = Mediapipe2dDetectionThreadWorker(path_to_folder_of_videos_to_process=synchronized_videos_folder_path,output_data_folder_path=output_data_folder_path,@@ -145,7 +141,7 @@ class ThreadWorkerManager(QWidget):use_triangulate_ransac: bool = False,):logger.info("Launching `Triangulate 3d Data` thread worker...")- self._session_progress_dictionary["triangulate"] = 'launched'+ self._session_progress_dictionary["triangulate"] = "launched"self._triangulate_3d_data_thread_worker = Triangulate3dDataThreadWorker(anipose_calibration_object=anipose_calibration_object,mediapipe_2d_data=mediapipe_2d_data,@@ -174,7 +170,7 @@ class ThreadWorkerManager(QWidget):auto_process_next_stage: bool = False,):logger.info("Launching `Post Process 3d Data` thread worker...")- self._session_progress_dictionary["post_process"] = 'launched'+ self._session_progress_dictionary["post_process"] = "launched"self._post_process_3d_data_thread_worker = PostProcess3dDataThreadWorker(skel3d_frame_marker_xyz=skel3d_frame_marker_xyz,skeleton_reprojection_error_fr_mar=skeleton_reprojection_error_fr_mar,@@ -198,7 +194,7 @@ class ThreadWorkerManager(QWidget):auto_process_next_stage: bool = False,):logger.info("Launching `Convert Npy to Csv` thread worker...")- self._session_progress_dictionary["convert_to_csv"] = 'launched'+ self._session_progress_dictionary["convert_to_csv"] = "launched"self._convert_npy_to_csv_thread_worker = ConvertNpyToCsvThreadWorker(skel3d_frame_marker_xyz=skel3d_frame_marker_xyz,output_data_folder_path=output_data_folder_path,@@ -222,7 +218,7 @@ class ThreadWorkerManager(QWidget):logger.info(f"Launching `session_playback_thread_worker` with frames_per_second set to {frames_per_second} ")- self._session_progress_dictionary["launch_session_playback"] = 'launched'+ self._session_progress_dictionary["launch_session_playback"] = "launched"self._session_playback_viewer_thread_worker = SessionPlaybackThreadWorker(frames_per_second=frames_per_second,list_of_video_paths=list_of_video_paths,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.pyindex 73d2d655..1bfadb44 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@@ -11,5 +11,6 @@ def send_pipedream_ping(pipe_dream_ping_dictionary):)r = requests.post(- "https://eoivu13g86if0cp.m.pipedream.net", json={"pinged_string": pipe_dream_ping_dictionary}+ "https://eoivu13g86if0cp.m.pipedream.net",+ json={"pinged_string": pipe_dream_ping_dictionary},)