biomechzoo 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

biomechzoo/conversion/mvnx2zoo_data.py

@@ -1,6 +1,6 @@
 import numpy as np
-from src.biomechzoo.mvn.load_mvnx import load_mvnx
-from src.biomechzoo.mvn.mvn import JOINTS, SEGMENTS
+from biomechzoo.mvn.load_mvnx import load_mvnx
+from biomechzoo.mvn.mvn import JOINTS, SEGMENTS
 
 def mvnx2zoo_data(fl):
     """ loads mvnx file from xsens"""
@@ -15,7 +15,7 @@ def mvnx2zoo_data(fl):
         try:
             r = mvnx_file.get_joint_angle(joint=key)
             data[val] = {
-                'line': r,
+                'line': np.array(r),
                 'event': {}
             }
         except KeyError:
@@ -25,8 +25,9 @@ def mvnx2zoo_data(fl):
     for key, val in SEGMENTS.items():
         try:
             r = mvnx_file.get_sensor_ori(segment=key)
+
             data[val] = {
-                'line': r,
+                'line': np.array(r),
                 'event': {}
             }
         except KeyError:
@@ -40,6 +41,17 @@ def mvnx2zoo_data(fl):
 
     return data
 
+def is_valid_for_zoo(val):
+    """
+    Returns True if the value is valid for a MATLAB-compatible zoo structure.
+    """
+    if val is None:
+        return False
+    if isinstance(val, list) and len(val) == 0:
+        return False
+    if isinstance(val, np.ndarray) and val.size == 0:
+        return False
+    return True
 
 def _get_meta_info(mvnx_file, data):
     # todo: add more, see mvnx_file object
@@ -51,7 +63,6 @@ def _get_meta_info(mvnx_file, data):
     data['zoosystem']['recording_date'] = mvnx_file.recording_date
     data['zoosystem']['original_file_name'] = mvnx_file.original_file_name
     data['zoosystem']['frame_count'] = mvnx_file.frame_count
-    data['zoosystem']['comments'] = mvnx_file.comments
     return data
 
 
@@ -75,7 +86,7 @@ def _get_foot_strike_events(mvnx_file, data):
         if LHeel[i - 1] == 0 and LHeel[i] == 1:
             hs_l.append(i)
 
-        # add to event branch of any channel
+    # add to event branch of any channel
     if 'jL5S1' in data:
         ch = 'jL5S1'
     else:
@@ -97,6 +108,6 @@ if __name__ == '__main__':
     from src.biomechzoo.utils.zplot import zplot
     # -------TESTING--------
     project_root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
-    fl = os.path.join(project_root, 'data', 'other', 'Flat-001.mvnx')
+    fl = os.path.join(project_root, 'data', 'other', 'Flat001.mvnx')
     data = mvnx2zoo_data(fl)
     zplot(data, 'jRightKnee')

biomechzoo/mvn/load_mvnx.py

@@ -6,8 +6,8 @@ Script to load an mvnx
 import xml.etree.ElementTree as ET
 import collections
 import numpy as np
-from src.biomechzoo.mvn.mvnx_file_accessor import MvnxFileAccessor
-from src.biomechzoo.mvn import mvn
+from biomechzoo.mvn.mvnx_file_accessor import MvnxFileAccessor
+from biomechzoo.mvn import mvn
 
 # Xml namespace for mvnx files
 ns = {'mvn': 'http://www.xsens.com/mvn/mvnx'}

biomechzoo/mvn/main_mvnx.py

@@ -1,7 +1,7 @@
 import os
 import argparse
 import matplotlib.pyplot as plt
-from src.biomechzoo.mvn.load_mvnx import load_mvnx
+from biomechzoo.mvn.load_mvnx import load_mvnx
 
 
 # Convert mvnx file to python data

biomechzoo/mvn/mvnx_file_accessor.py

@@ -1,4 +1,4 @@
-from src.biomechzoo.mvn import mvn
+from biomechzoo.mvn import mvn
 import warnings
 
 

{biomechzoo-0.4.0.dist-info → biomechzoo-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: biomechzoo
-Version: 0.4.0
+Version: 0.4.1
 Summary: Python implementation of the biomechZoo toolbox
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/mcgillmotionlab/biomechzoo

{biomechzoo-0.4.0.dist-info → biomechzoo-0.4.1.dist-info}/RECORD

@@ -13,13 +13,13 @@ biomechzoo/biomech_ops/phase_angle_line.py,sha256=p6osB17_3QQSyKLNojuc6nYhv-k0K6
 biomechzoo/conversion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/conversion/c3d2zoo_data.py,sha256=kmiLQHglchSHty6DrMEl5yTOUi3U4Ai5nHoSGvbF6k8,2660
 biomechzoo/conversion/csv2zoo_data.py,sha256=-c4CXxcKd70HJWWgHRztOxOckvA1XgIDzo8EhgJhcKE,2185
-biomechzoo/conversion/mvnx2zoo_data.py,sha256=4F0TE1oK9RuSSbWIgScG6SmWuPrSTC8ml8kGv6CDrp4,3229
+biomechzoo/conversion/mvnx2zoo_data.py,sha256=tlqg8iVmTxQPo9u9T8mghS2eAEtqOF3xB7tTNR0H1mQ,3504
 biomechzoo/conversion/opencap2zoo_data.py,sha256=n4bLsrJI0wTSzG5bgJcmxj1dp2plnUKFNRzcTIbmV1o,608
 biomechzoo/mvn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-biomechzoo/mvn/load_mvnx.py,sha256=WNC99LZKCklffv3dfyThzvfaDekET6UPGJj0sDJr3rc,22507
-biomechzoo/mvn/main_mvnx.py,sha256=p0UZllNC2el9Y0wT3Y7CHJMY0wJlAYSxcDQOx_71158,2398
+biomechzoo/mvn/load_mvnx.py,sha256=B4VGuidQ-5G_5E1t5vpU51Nb_Lu85_EOS_FmGZYjfX8,22499
+biomechzoo/mvn/main_mvnx.py,sha256=e1LasJQ9icyzjWnRCEcAWQq_-L13-mIzf7PzYA3QYDg,2394
 biomechzoo/mvn/mvn.py,sha256=I62ljRo0I0ajc6KLW8J4SmXL_M-rHerHinD_UaFzS8U,7537
-biomechzoo/mvn/mvnx_file_accessor.py,sha256=WZRle0cCSBDzcEIrFnAevPnop5o8qDzBC-jek3rIfBo,20123
+biomechzoo/mvn/mvnx_file_accessor.py,sha256=Gk2vKq9v_gPbnOS_12zgeJehjFz7v3ClTnN2v4FBdsI,20119
 biomechzoo/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/processing/add_channel_data.py,sha256=U1xLLBSnyJeeDWzgmHSxOz1hyguzuuDXxQCQ8IFoZkw,1955
 biomechzoo/processing/addchannel_data.py,sha256=rmnnlMRVkoMlQCR-nRg1jjh-hzMDt37Sx9fAmocrpqA,1953
@@ -40,9 +40,9 @@ biomechzoo/utils/split_trial.py,sha256=Fumz_ZukNBNtPauUhCge5EAHkg05dYDhA1_njQw0l
 biomechzoo/utils/zload.py,sha256=FPT6_-gwaOOqOckjgPRfnKEVKMsmNVIcenmQZF2KOvo,1535
 biomechzoo/utils/zplot.py,sha256=WVA8aCy1Pqy_bo_HXab9AmW-cBd8J8MPX2LAOd6dznU,1512
 biomechzoo/utils/zsave.py,sha256=2DeF6A1R32SnXJXtb8jtPqZAmlSEB0PVi09UGiskzMo,1625
-biomechzoo-0.4.0.dist-info/licenses/LICENSE,sha256=Fsz62nrgRORre3A1wNXUDISaHoostodMvocRPDdXc9w,1076
-biomechzoo-0.4.0.dist-info/METADATA,sha256=gXIvcVxfbwksEfnRZsvyuJyTdGy1djfiLkTciZED3YQ,1259
-biomechzoo-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-biomechzoo-0.4.0.dist-info/entry_points.txt,sha256=VdryUUiwwvx0WZxrgmMrsyfe5Z1jtyaxdXOi0zWHOqk,41
-biomechzoo-0.4.0.dist-info/top_level.txt,sha256=W148kdiK-6L0Nohbw8UALkAzHJvJLAhFDRykuva2WjY,11
-biomechzoo-0.4.0.dist-info/RECORD,,
+biomechzoo-0.4.1.dist-info/licenses/LICENSE,sha256=Fsz62nrgRORre3A1wNXUDISaHoostodMvocRPDdXc9w,1076
+biomechzoo-0.4.1.dist-info/METADATA,sha256=4wd_Ax4xnp2kUdrPrQEeprveTWZfv7a7lYfhN76n3NA,1259
+biomechzoo-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+biomechzoo-0.4.1.dist-info/entry_points.txt,sha256=VdryUUiwwvx0WZxrgmMrsyfe5Z1jtyaxdXOi0zWHOqk,41
+biomechzoo-0.4.1.dist-info/top_level.txt,sha256=W148kdiK-6L0Nohbw8UALkAzHJvJLAhFDRykuva2WjY,11
+biomechzoo-0.4.1.dist-info/RECORD,,