Free Motion Capture for Everyone πβ¨
TypeScript
Sort videos when getting paths (#682)
Aaron Cherian5a577b1913dc
diff --git a/freemocap/gui/qt/widgets/butterworth_warning_dialog.py b/freemocap/gui/qt/widgets/butterworth_warning_dialog.pyindex b04fe883..9f276b48 100644--- a/freemocap/gui/qt/widgets/butterworth_warning_dialog.py+++ b/freemocap/gui/qt/widgets/butterworth_warning_dialog.py@@ -2,9 +2,16 @@ import threadingfrom PySide6.QtCore import Qt, QSizefrom PySide6.QtGui import QPixmap-from PySide6.QtWidgets import (QDialog, QVBoxLayout, QHBoxLayout, QLabel,- QCheckBox, QPushButton, QSpacerItem,- QSizePolicy)+from PySide6.QtWidgets import (+ QDialog,+ QVBoxLayout,+ QHBoxLayout,+ QLabel,+ QCheckBox,+ QPushButton,+ QSpacerItem,+ QSizePolicy,+)from freemocap.gui.qt.utilities.save_and_load_gui_state import GuiState, save_gui_statefrom freemocap.system.paths_and_filenames.file_and_folder_names import PATH_TO_FREEMOCAP_LOGO_SVG@@ -21,7 +28,8 @@ class Version_1_5_4_DataWarningDialog(QDialog):self.setMinimumSize(700, 400)self.setWindowTitle("Data Quality Advisory")- self.setStyleSheet("""+ self.setStyleSheet(+ """QDialog {background-color: #f8f9fa;}@@ -31,7 +39,8 @@ class Version_1_5_4_DataWarningDialog(QDialog):QCheckBox {color: #495057;}- """)+ """+ )main_layout = QVBoxLayout()main_layout.setContentsMargins(30, 30, 30, 30)@@ -60,11 +69,10 @@ class Version_1_5_4_DataWarningDialog(QDialog):</p><p>We identified and fixed a bug in <b>v1.4.7-v1.5.3 (10 Oct 2024 - 10 Mar 2025)</b> that caused the pipeline to Butterworth filtering during processing (<a href="https://github.com/freemocap/freemocap/pull/675">Bugfix PR</a>).-Recordings from these versions may have increased noise/jitter/shakiness in the final keypoint trajectories.<br/><br/>Based on your application, the difference may or may not be noticeable. It is most likely to affect users who's applications focus on fine grained trajectories of the hands and limbs (especially for scientific analysis)- <br/><br/>+ <br/><br/><b>We recommend reprocessing any critical data collected during this period with the latest version of FreeMoCap to ensure the highest quality results.</b><br/><br/>You may also filter the data in Blender (see <a href="https://www.youtube.com/watch?v=33OhM5xFUlg">this tutorial Flux Renders</a>)@@ -74,18 +82,20 @@ class Version_1_5_4_DataWarningDialog(QDialog):In preparation for the release of FreeMoCap v2.0 (optimistically Summer 2025), we are implementing a <a href="https://github.com/freemocap/freemocap/pull/676"> set of comprehensive quality assurance diagnostics </a>to ensure that the quality of our output is strictly monotonic across future versions.<p style="font-size: 13px; margin-top: 20px; color: #7f8c8d;">- Thanks to (<a href="https://discord.com/channels/760487252379041812/760489602917466133/1346487740568440983">@larap for reporting</a>), and to the rest of the freemocap community for their help in developing this project.+ Thanks to (<a href="https://discord.com/channels/760487252379041812/760489602917466133/1346487740568440983">@larap for reporting</a>), and to the rest of the freemocap community for their help in developing this project.</p></body></html>"""content = QLabel(warning_text)- content.setStyleSheet("""- font-size: 14px;+ content.setStyleSheet(+ """+ font-size: 14px;line-height: 1.4;color: #2c3e50;- """)+ """+ )content.setWordWrap(True)content.setOpenExternalLinks(True)@@ -100,11 +110,7 @@ class Version_1_5_4_DataWarningDialog(QDialog):pixmap = QPixmap(SKELLY_SWEAT_SVG)if not pixmap.isNull():# Scale the pixmap to fit within 150x150 while maintaining aspect ratio- scaled_pixmap = pixmap.scaled(- 150, 150,- Qt.KeepAspectRatio,- Qt.SmoothTransformation- )+ scaled_pixmap = pixmap.scaled(150, 150, Qt.KeepAspectRatio, Qt.SmoothTransformation)logo_label.setPixmap(scaled_pixmap)else:@@ -123,7 +129,8 @@ class Version_1_5_4_DataWarningDialog(QDialog):self._dont_show_again_checkbox.stateChanged.connect(self._dont_show_again_checkbox_changed)done_btn = QPushButton("Ok")- done_btn.setStyleSheet("""+ done_btn.setStyleSheet(+ """QPushButton {background-color: #3498db;color: white;@@ -136,7 +143,8 @@ class Version_1_5_4_DataWarningDialog(QDialog):QPushButton:hover {background-color: #2980b9;}- """)+ """+ )done_btn.clicked.connect(self.accept)controls_layout.addWidget(self._dont_show_again_checkbox)diff --git a/freemocap/system/paths_and_filenames/file_and_folder_names.py b/freemocap/system/paths_and_filenames/file_and_folder_names.pyindex 0a8f4117..408588bb 100644--- a/freemocap/system/paths_and_filenames/file_and_folder_names.py+++ b/freemocap/system/paths_and_filenames/file_and_folder_names.py@@ -48,8 +48,8 @@ OLD_SEGMENT_CENTER_OF_MASS_NPY_FILE_NAME = "segmentCOM_frame_joint_xyz.npy"RECORDING_PARAMETERS_JSON_FILE_NAME = "recording_parameters.json"# Figshare info-FIGSHARE_SAMPLE_ZIP_FILE_URL = "https://figshare.com/ndownloader/files/45797067"-FIGSHARE_TEST_ZIP_FILE_URL = "https://figshare.com/ndownloader/files/45797073"+FIGSHARE_SAMPLE_ZIP_FILE_URL = "https://figshare.com/ndownloader/files/53681960"+FIGSHARE_TEST_ZIP_FILE_URL = "https://figshare.com/ndownloader/files/53682050"FREEMOCAP_TEST_DATA_RECORDING_NAME = "freemocap_test_data"FREEMOCAP_SAMPLE_DATA_RECORDING_NAME = "freemocap_sample_data"diff --git a/freemocap/utilities/get_video_paths.py b/freemocap/utilities/get_video_paths.pyindex 8f91bd56..d48a6f19 100644--- a/freemocap/utilities/get_video_paths.py+++ b/freemocap/utilities/get_video_paths.py@@ -9,8 +9,7 @@ def get_video_paths(path_to_video_folder: Union[str, Path]) -> List[Path]: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+ return sorted(unique_list_of_video_paths, key=lambda p: str(p).lower())def get_unique_list(list: list) -> list:diff --git a/pyproject.toml b/pyproject.tomlindex 7c357488..64c4dfdb 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -67,10 +67,10 @@ keywords = [dependencies = ["skellycam==2024.09.1094",- "skelly_viewer==2024.12.1026",+ "skelly_viewer==2025.04.1028","skellyforge==2024.12.1009",- "skelly_synchronize==2024.07.1032",- "skellytracker[all]==2024.09.1019",+ "skelly_synchronize==2025.04.1037",+ "skellytracker[all]==2025.04.1021","ajc27_freemocap_blender_addon==v2025.1.1035","opencv-contrib-python==4.8.*","toml==0.10.2",