Skip to content

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

TypeScript

Update sample and test data (#576)

philipqueenbcdfec6717e3
diff --git a/freemocap/gui/qt/workers/download_sample_data_thread_worker.py b/freemocap/gui/qt/workers/download_sample_data_thread_worker.py
index 3d7926b9..a0a6ba34 100644
--- a/freemocap/gui/qt/workers/download_sample_data_thread_worker.py
+++ b/freemocap/gui/qt/workers/download_sample_data_thread_worker.py
@@ -31,5 +31,5 @@ class DownloadDataThreadWorker(QThread):
except Exception as e: # noqa
logger.exception(e)
- logger.error(f"Error downloading sample data from {self._dowload_url}")
+ logger.error(f"Error downloading sample data from {self.download_url}")
raise e
diff --git a/freemocap/system/paths_and_filenames/file_and_folder_names.py b/freemocap/system/paths_and_filenames/file_and_folder_names.py
index 1fc13bb5..dcb8bd9a 100644
--- a/freemocap/system/paths_and_filenames/file_and_folder_names.py
+++ b/freemocap/system/paths_and_filenames/file_and_folder_names.py
@@ -44,9 +44,10 @@ 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/41368323"
-FIGSHARE_TEST_ZIP_FILE_URL = "https://figshare.com/ndownloader/files/40293973"
-FREEMOCAP_TEST_DATA_RECORDING_NAME = "freemocap_sample_data"
+FIGSHARE_SAMPLE_ZIP_FILE_URL = "https://figshare.com/ndownloader/files/45797067"
+FIGSHARE_TEST_ZIP_FILE_URL = "https://figshare.com/ndownloader/files/45797073"
+FREEMOCAP_TEST_DATA_RECORDING_NAME = "freemocap_test_data"
+FREEMOCAP_SAMPLE_DATA_RECORDING_NAME = "freemocap_sample_data"
# logo
PATH_TO_FREEMOCAP_LOGO_SVG = str(Path(freemocap.__file__).parent / "assets/logo/freemocap-logo-black-border.svg")
diff --git a/freemocap/utilities/download_sample_data.py b/freemocap/utilities/download_sample_data.py
index 017d4067..11175675 100644
--- a/freemocap/utilities/download_sample_data.py
+++ b/freemocap/utilities/download_sample_data.py
@@ -6,6 +6,8 @@ from pathlib import Path
import requests
from freemocap.system.paths_and_filenames.file_and_folder_names import (
+ FIGSHARE_SAMPLE_ZIP_FILE_URL,
+ FREEMOCAP_SAMPLE_DATA_RECORDING_NAME,
FREEMOCAP_TEST_DATA_RECORDING_NAME,
FIGSHARE_TEST_ZIP_FILE_URL,
)
@@ -38,7 +40,12 @@ def download_sample_data(sample_data_zip_file_url: str = FIGSHARE_TEST_ZIP_FILE_
z = zipfile.ZipFile(io.BytesIO(r.content))
z.extractall(recording_session_folder_path)
- figshare_sample_data_path = recording_session_folder_path / FREEMOCAP_TEST_DATA_RECORDING_NAME
+ if sample_data_zip_file_url == FIGSHARE_TEST_ZIP_FILE_URL:
+ figshare_sample_data_path = recording_session_folder_path / FREEMOCAP_TEST_DATA_RECORDING_NAME
+ elif sample_data_zip_file_url == FIGSHARE_SAMPLE_ZIP_FILE_URL:
+ figshare_sample_data_path = recording_session_folder_path / FREEMOCAP_SAMPLE_DATA_RECORDING_NAME
+ else:
+ figshare_sample_data_path = recording_session_folder_path / "unknown_sample_data"
logger.info(f"Sample data extracted to {str(figshare_sample_data_path)}")
return str(figshare_sample_data_path)