Free Motion Capture for Everyone πβ¨
TypeScript
Improve case handling with video files (#350)
philipqueen416f05ec8153
diff --git a/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.pyindex 0f65cb70..88f60ee7 100644--- a/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py+++ b/freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_detector.py@@ -17,6 +17,8 @@ from freemocap.core_processes.detecting_things_in_2d_images.mediapipe_stuff.medimediapipe_tracked_point_names_dict,)from freemocap.parameter_info_models.recording_processing_parameter_models import MediapipeParametersModel+from freemocap.utilities.get_video_paths import get_video_paths+logger = logging.getLogger(__name__)@@ -160,7 +162,7 @@ class MediaPipeSkeletonDetector:logger.info(f"processing videos from: {path_to_folder_of_videos_to_process}")mediapipe2d_single_camera_npy_arrays_list = []- for video_number, synchronized_video_file_path in enumerate(path_to_folder_of_videos_to_process.glob("*.mp4")):+ for video_number, synchronized_video_file_path in enumerate(get_video_paths(path_to_folder_of_videos_to_process)):logger.info(f"Running `mediapipe` skeleton detection on video: {str(synchronized_video_file_path)}")video_capture_object = cv2.VideoCapture(str(synchronized_video_file_path))diff --git a/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/alpha_freemocap_blender_megascript.py b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/alpha_freemocap_blender_megascript.pyindex 4bd74299..3608e0c7 100644--- a/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/alpha_freemocap_blender_megascript.py+++ b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/alpha_freemocap_blender_megascript.py@@ -4,6 +4,7 @@ from pathlib import Pathimport bpyimport numpy as np+print(" - Starting (alpha) blender megascript - ")#######################################################################@@ -13,6 +14,24 @@ bpy.ops.preferences.addon_enable(module="rigify")#######################################################################+def get_video_paths(path_to_video_folder: Path) -> list:+ """Search the folder for 'mp4' files (case insensitive) and return them as a list"""++ list_of_video_paths = list(Path(path_to_video_folder).glob("*.mp4")) + list(+ Path(path_to_video_folder).glob("*.MP4")+ )+ unique_list_of_video_paths = get_unique_list(list_of_video_paths)++ return unique_list_of_video_paths+++def get_unique_list(list: list) -> list:+ """Return a list of the unique elements from input list"""+ unique_list = []+ [unique_list.append(clip) for clip in list if clip not in unique_list]++ return unique_list+try:##% Session path# #get session path as command line argument@@ -1617,14 +1636,14 @@ try:world_origin = bpy.data.objects["world_origin"]- number_of_videos = len(list(vidFolderPath.glob("*.mp4")))+ number_of_videos = len(list(get_video_paths(vidFolderPath)))vid_location_scale = 1for (vid_number,thisVidPath,- ) in enumerate(vidFolderPath.glob("*.mp4")):+ ) in enumerate(get_video_paths(vidFolderPath)):print(thisVidPath)# use 'images as planes' add on to load in the video files as planesbpy.ops.import_image.to_plane(diff --git a/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.pyindex c5155043..9c8870d7 100644--- a/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py+++ b/freemocap/core_processes/export_data/blender_stuff/blender_bpy_export_scripts/freemocap_blender_megascript_take2.py@@ -9,6 +9,7 @@ import addon_utilsimport bpyimport numpy as np+print("Running script to create Blender file from freemocap session data: " + __file__)logger = logging.getLogger(__name__)@@ -385,12 +386,12 @@ def main(recording_path: Union[str, Path],def add_videos_to_scene(videos_path: Union[Path, str], parent_object: bpy.types.Object, vid_location_scale: float = 2):print("loading videos as planes...")- number_of_videos = len(list(videos_path.glob("*.mp4")))+ number_of_videos = len(list(get_video_paths(videos_path)))print(f"Found {number_of_videos} videos in {videos_path}")for (video_number,video_path,- ) in enumerate(videos_path.glob("*.mp4")):+ ) in enumerate(get_video_paths(videos_path)):print(f"Adding video: {video_path.name} to scene")bpy.ops.import_image.to_plane(@@ -651,6 +652,24 @@ def creating_stick_figure_mesh_from_bone_dictionary(trajectory_frame_marker_xyz:vertex.keyframe_insert(data_path="co", frame=frame_number) # keyframe the vertex locationmesh.update()+def get_video_paths(path_to_video_folder: Path) -> list:+ """Search the folder for 'mp4' files (case insensitive) and return them as a list"""++ list_of_video_paths = list(Path(path_to_video_folder).glob("*.mp4")) + list(+ Path(path_to_video_folder).glob("*.MP4")+ )+ unique_list_of_video_paths = get_unique_list(list_of_video_paths)++ return unique_list_of_video_paths+++def get_unique_list(list: list) -> list:+ """Return a list of the unique elements from input list"""+ unique_list = []+ [unique_list.append(clip) for clip in list if clip not in unique_list]++ return unique_list+mediapipe_empty_names = {# generated by: freemocap/core_processes/detecting_things_in_2d_images/mediapipe_stuff/mediapipe_skeleton_names_and_connections.pydiff --git a/freemocap/gui/qt/widgets/welcome_panel_widget.py b/freemocap/gui/qt/widgets/welcome_panel_widget.pyindex f5f8429f..9516cdae 100644--- a/freemocap/gui/qt/widgets/welcome_panel_widget.py+++ b/freemocap/gui/qt/widgets/welcome_panel_widget.py@@ -39,6 +39,8 @@ class WelcomeToFreemocapPanel(QWidget):self.sizePolicy().setHorizontalStretch(1)self.sizePolicy().setVerticalStretch(1)+ self._layout.addStretch(1)+self._add_freemocap_logo()self._welcome_to_freemocap_title_widget = self._welcome_to_freemocap_title()@@ -54,35 +56,18 @@ class WelcomeToFreemocapPanel(QWidget):self._load_most_recent_session_button = WelcomeScreenButton(f"{LOAD_MOST_RECENT_RECORDING_ACTION_NAME}")- self._load_most_recent_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)- self._layout.addWidget(self._load_most_recent_session_button, alignment=Qt.AlignmentFlag.AlignCenter)-- self._load_existing_session_button = WelcomeScreenButton(f"{LOAD_EXISTING_RECORDING_ACTION_NAME}")- self._load_existing_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)- self._layout.addWidget(self._load_existing_session_button, alignment=Qt.AlignmentFlag.AlignCenter)+ # self._load_most_recent_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)+ # self._layout.addWidget(self._load_most_recent_session_button, alignment=Qt.AlignmentFlag.AlignCenter)+ #+ # self._load_existing_session_button = WelcomeScreenButton(f"{LOAD_EXISTING_RECORDING_ACTION_NAME}")+ # self._load_existing_session_button.clicked.connect(actions.load_most_recent_recording_action.trigger)+ # self._layout.addWidget(self._load_existing_session_button, alignment=Qt.AlignmentFlag.AlignCenter)self._import_videos_button = WelcomeScreenButton(f"{IMPORT_VIDEOS_ACTION_NAME}")self._import_videos_button.clicked.connect(actions.import_videos_action.trigger)self._layout.addWidget(self._import_videos_button, alignment=Qt.AlignmentFlag.AlignCenter)- # self._kill_threads_and_processes_button = WelcomeScreenButton(- # f"{KILL_THREADS_AND_PROCESSES_ACTION_NAME} (Ctrl+K)"- # )- # self._kill_threads_and_processes_button.clicked.connect(- # actions.kill_running_threads_and_processes_action.trigger- # )- # self._layout.addWidget(self._kill_threads_and_processes_button, alignment=Qt.AlignmentFlag.AlignCenter)- # self._kill_threads_and_processes_button.setProperty("secondary_button", True)- #- # self._reboot_gui_button = WelcomeScreenButton(f"{REBOOT_GUI_ACTION_NAME} (Ctrl+R)")- # self._reboot_gui_button.clicked.connect(actions.reboot_gui_action.trigger)- # self._layout.addWidget(self._reboot_gui_button, alignment=Qt.AlignmentFlag.AlignCenter)- # self._reboot_gui_button.setProperty("secondary_button", True)- #- # self._exit_button = WelcomeScreenButton(f"{EXIT_ACTION_NAME} (Ctrl+Q)")- # self._exit_button.clicked.connect(actions.exit_action.trigger)- # self._layout.addWidget(self._exit_button, alignment=Qt.AlignmentFlag.AlignCenter)- # self._exit_button.setProperty("secondary_button", True)+ self._layout.addStretch(1)send_pings_string = "Send ping to devs to let us know when you make a new session (being able to show that people are using this thing will help us get funding for this project :D )"self._send_pings_checkbox = QCheckBox(send_pings_string)diff --git a/freemocap/tests/test_mediapipe_2d_data_shape.py b/freemocap/tests/test_mediapipe_2d_data_shape.pyindex 6fd42488..ff45913a 100644--- a/freemocap/tests/test_mediapipe_2d_data_shape.py+++ b/freemocap/tests/test_mediapipe_2d_data_shape.py@@ -6,6 +6,7 @@ import numpy as npfrom freemocap.tests.utilities.get_number_of_frames_of_videos_in_a_folder import (get_number_of_frames_of_videos_in_a_folder,)+from freemocap.utilities.get_video_paths import get_video_pathsdef test_mediapipe_2d_data_shape(@@ -28,7 +29,7 @@ def test_mediapipe_2d_data_shape(mediapipe_2d_data = np.load(mediapipe_2d_data_file_path)- list_of_video_paths = list(Path(synchronized_videos_folder).glob("*.mp4"))+ list_of_video_paths = get_video_paths(Path(synchronized_videos_folder))number_of_videos = len(list_of_video_paths)assert mediapipe_2d_data.shape[0] == number_of_videosdiff --git a/freemocap/tests/test_synchronized_video_frame_counts.py b/freemocap/tests/test_synchronized_video_frame_counts.pyindex 3022e5ad..04f4668e 100644--- a/freemocap/tests/test_synchronized_video_frame_counts.py+++ b/freemocap/tests/test_synchronized_video_frame_counts.py@@ -4,13 +4,14 @@ from typing import Unionfrom freemocap.tests.utilities.get_number_of_frames_of_videos_in_a_folder import (get_number_of_frames_of_videos_in_a_folder,)+from freemocap.utilities.get_video_paths import get_video_pathsdef test_synchronized_video_frame_counts(video_folder_path: Union[Path, str]):"""Test if all the videos in this folder have precisely the same number of frames"""- list_of_video_paths = list(Path(video_folder_path).glob("*.mp4"))+ list_of_video_paths = get_video_paths(Path(video_folder_path))assert len(list_of_video_paths) > 0, f"No videos found in {video_folder_path}"diff --git a/freemocap/tests/utilities/get_number_of_frames_of_videos_in_a_folder.py b/freemocap/tests/utilities/get_number_of_frames_of_videos_in_a_folder.pyindex 1f51285d..b2819178 100644--- a/freemocap/tests/utilities/get_number_of_frames_of_videos_in_a_folder.py+++ b/freemocap/tests/utilities/get_number_of_frames_of_videos_in_a_folder.py@@ -4,6 +4,8 @@ from typing import Unionimport cv2+from freemocap.utilities.get_video_paths import get_video_paths+logger = logging.getLogger(__name__)@@ -12,7 +14,7 @@ def get_number_of_frames_of_videos_in_a_folder(folder_path: Union[str, Path]):Get the number of frames in the first video in a folder"""- list_of_video_paths = list(Path(folder_path).glob("*.mp4"))+ list_of_video_paths = get_video_paths(Path(folder_path))if len(list_of_video_paths) == 0:logger.error(f"No videos found in {folder_path}")diff --git a/freemocap/utilities/get_video_paths.py b/freemocap/utilities/get_video_paths.pynew file mode 100644index 00000000..63e390ea--- /dev/null+++ b/freemocap/utilities/get_video_paths.py@@ -0,0 +1,20 @@+from pathlib import Path+++def get_video_paths(path_to_video_folder: Path) -> list:+ """Search the folder for 'mp4' files (case insensitive) and return them as a list"""++ list_of_video_paths = list(Path(path_to_video_folder).glob("*.mp4")) + list(+ Path(path_to_video_folder).glob("*.MP4")+ )+ unique_list_of_video_paths = get_unique_list(list_of_video_paths)++ return unique_list_of_video_paths+++def get_unique_list(list: list) -> list:+ """Return a list of the unique elements from input list"""+ unique_list = []+ [unique_list.append(clip) for clip in list if clip not in unique_list]++ return unique_list