From 588560183501c0034a8eadea1b98081aa302203a Mon Sep 17 00:00:00 2001 From: Pariterre Date: Fri, 12 Apr 2024 18:29:37 -0400 Subject: [PATCH 1/3] Updated for biorbd 1.11.1 --- bioviz/analyses/muscle_analyses.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bioviz/analyses/muscle_analyses.py b/bioviz/analyses/muscle_analyses.py index 7d03dc4..c75a4a4 100644 --- a/bioviz/analyses/muscle_analyses.py +++ b/bioviz/analyses/muscle_analyses.py @@ -211,12 +211,11 @@ def __compute_all_values(self): active_forces = np.ndarray((self.n_point_for_q, self.n_mus)) emg = biorbd.State(0, self.active_forces_slider.value() / 100) for i, q_mod in enumerate(all_q): - self.model.UpdateKinematicsCustom(biorbd.GeneralizedCoordinates(q_mod)) + self.model.updateMuscles(biorbd.GeneralizedCoordinates(q_mod), True) for m in range(self.n_mus): if self.checkboxes_muscle[m].isChecked(): mus_group_idx, mus_idx, cmp_mus = self.muscle_mapping[self.checkboxes_muscle[m].text()] mus = self.model.muscleGroup(mus_group_idx).muscle(mus_idx) - mus.updateOrientations(self.model, q_mod, 1) muscles_length_jacobian = self.model.musclesLengthJacobian().to_array() length[i, m] = mus.length(self.model, q_mod, False) From 7ff533cfc02ebe3d1df62fa8016056e317325567 Mon Sep 17 00:00:00 2001 From: Pariterre Date: Wed, 15 May 2024 15:33:47 -0400 Subject: [PATCH 2/3] Linting typo --- bioviz/biorbd_vtk.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bioviz/biorbd_vtk.py b/bioviz/biorbd_vtk.py index c0695d8..5832e71 100644 --- a/bioviz/biorbd_vtk.py +++ b/bioviz/biorbd_vtk.py @@ -206,7 +206,7 @@ class _MarkerInternal: size: float color: tuple[float, float, float] opacity: float - actors: list[QVTKRenderWindowInteractor, ...] + actors: list[QVTKRenderWindowInteractor] class VtkModel(QtWidgets.QWidget): @@ -284,7 +284,7 @@ def __init__( actors=list(), ), } - self.markers_link_actors: list[QVTKRenderWindowInteractor, ...] = list() + self.markers_link_actors: list[QVTKRenderWindowInteractor] = list() self.contacts = Markers() self.contacts_size = contacts_size @@ -461,7 +461,7 @@ def update_markers(self, markers): self._update_markers(markers, "model") def update_experimental_markers( - self, markers, with_link: bool = True, virtual_to_experimental_markers_indices: list[int, ...] = None + self, markers, with_link: bool = True, virtual_to_experimental_markers_indices: list[int] = None ): """ Update position of the experimental markers on the screen (but do not repaint) @@ -1842,7 +1842,7 @@ def new_gravity_vector(self, segment_rt, gravity, length, normalization_ratio, v Parameters ---------- segment_rt : np.ndarray - homogeneous matrix in which coordinates are applied + homogenous matrix in which coordinates are applied gravity : np.ndarray gravity array with 3 application coordinates and 3 magnitude coordinates length : float From a994300223a8a03ef49d6a3362df017e5b6af187 Mon Sep 17 00:00:00 2001 From: Pariterre Date: Mon, 17 Jun 2024 15:39:40 -0400 Subject: [PATCH 3/3] Bumped version number --- bioviz/__init__.py | 2 +- bioviz/_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bioviz/__init__.py b/bioviz/__init__.py index eb11480..3fcda99 100644 --- a/bioviz/__init__.py +++ b/bioviz/__init__.py @@ -36,7 +36,7 @@ from .qt_ui.rectangle_on_slider import RectangleOnSlider from ._version import __version__, check_version -check_version(biorbd, "1.9.1", "2.0.0") +check_version(biorbd, "1.11.1", "2.0.0") check_version(pyomeca, "2020.0.1", "2020.1.0") diff --git a/bioviz/_version.py b/bioviz/_version.py index 1dc43c4..b9901cf 100644 --- a/bioviz/_version.py +++ b/bioviz/_version.py @@ -1,6 +1,6 @@ from packaging.version import parse as parse_version -__version__ = "2.3.2" +__version__ = "2.4.0" def check_version(tool_to_compare, min_version, max_version):