diff --git a/BiorbdViz/__init__.py b/BiorbdViz/__init__.py index 0d2507a..ee19f62 100644 --- a/BiorbdViz/__init__.py +++ b/BiorbdViz/__init__.py @@ -30,11 +30,11 @@ def __init__(self, model_path=None, loaded_model=None, # Load and store the model if loaded_model is not None: - if not isinstance(loaded_model, biorbd.s2mMusculoSkeletalModel): - raise TypeError("loaded_model should be of a biorbd.s2mMusculoSkeletalModel type") + if not isinstance(loaded_model, biorbd.Model): + raise TypeError("loaded_model should be of a biorbd.Model type") self.model = loaded_model elif model_path is not None: - self.model = biorbd.s2mMusculoSkeletalModel(model_path) + self.model = biorbd.Model(model_path) else: raise ValueError("loaded_model or model_path must be provided") @@ -82,13 +82,13 @@ def __init__(self, model_path=None, loaded_model=None, for group_idx in range(self.model.nbMuscleGroups()): for muscle_idx in range(self.model.muscleGroup(group_idx).nbMuscles()): musc_tp = self.model.muscleGroup(group_idx).muscle(muscle_idx) - muscle_type = biorbd.s2mMusculoSkeletalModel.getMuscleType(musc_tp) + muscle_type = biorbd.Model.getMuscleType(musc_tp).getString() if muscle_type == "Hill": - musc = biorbd.s2mMuscleHillType(musc_tp) + musc = biorbd.HillType(musc_tp) elif muscle_type == "HillThelen": - musc = biorbd.s2mMuscleHillTypeThelen(musc_tp) + musc = biorbd.HillTypeThelen(musc_tp) elif muscle_type == "HillSimple": - musc = biorbd.s2mMuscleHillTypeSimple(musc_tp) + musc = biorbd.HillTypeSimple(musc_tp) tp = np.ndarray((3, len(musc.position().musclesPointsInGlobal()), 1)) for k, pts in enumerate(musc.position().musclesPointsInGlobal()): tp[:, k, 0] = pts.get_array() @@ -148,7 +148,7 @@ def set_q(self, Q, refresh_window=True): raise TypeError(f"Q should be a {self.nQ} column vector") self.Q = Q - self.model.UpdateKinematicsCustom(self.model, biorbd.s2mGenCoord(self.Q)) + self.model.UpdateKinematicsCustom(self.model, biorbd.GeneralizedCoordinates(self.Q)) if self.show_muscles: self.__set_muscles_from_q() if self.show_rt: @@ -500,13 +500,13 @@ def __set_muscles_from_q(self): for group_idx in range(self.model.nbMuscleGroups()): for muscle_idx in range(self.model.muscleGroup(group_idx).nbMuscles()): musc_tp = self.model.muscleGroup(group_idx).muscle(muscle_idx) - muscle_type = biorbd.s2mMusculoSkeletalModel.getMuscleType(musc_tp) + muscle_type = biorbd.Model.getMuscleType(musc_tp).getString() if muscle_type == "Hill": - musc = biorbd.s2mMuscleHillType(musc_tp) + musc = biorbd.HillType(musc_tp) elif muscle_type == "HillThelen": - musc = biorbd.s2mMuscleHillTypeThelen(musc_tp) + musc = biorbd.HillTypeThelen(musc_tp) elif muscle_type == "HillSimple": - musc = biorbd.s2mMuscleHillTypeSimple(musc_tp) + musc = biorbd.HillTypeSimple(musc_tp) for k, pts in enumerate(musc.position().musclesPointsInGlobal()): self.muscles.get_frame(0)[idx][0:3, k] = pts.get_array() idx += 1 diff --git a/BiorbdViz/analyses.py b/BiorbdViz/analyses.py index f1b9a25..9e4cdba 100644 --- a/BiorbdViz/analyses.py +++ b/BiorbdViz/analyses.py @@ -102,7 +102,7 @@ def __init__(self, parent, main_window, background_color=(.5, .5, .5)): for group in range(self.model.nbMuscleGroups()): for mus in range(self.model.muscleGroup(group).nbMuscles()): # Map the name to the right numbers - name = biorbd.s2mMuscleHillType.getRef(self.model.muscleGroup(group).muscle(mus)).name() + name = biorbd.HillType.getRef(self.model.muscleGroup(group).muscle(mus)).name().getString() self.muscle_mapping[name] = (group, mus, cmp_mus) # Add the CheckBox @@ -212,7 +212,7 @@ def __get_muscle_lengths(self, q_idx, mus_group_idx, mus_idx, _): x_axis, all_q = self.__generate_x_axis(q_idx) length = np.ndarray(x_axis.shape) for i, q_mod in enumerate(all_q): - length[i] = biorbd.s2mMuscleHillType.getRef( + length[i] = biorbd.HillType.getRef( self.model.muscleGroup(mus_group_idx).muscle(mus_idx)).length(self.model, q_mod) return x_axis, length @@ -224,7 +224,7 @@ def __get_moment_arms(self, q_idx, _, __, mus_idx): return x_axis, moment_arm def __get_passive_forces(self, q_idx, mus_group_idx, mus_idx, _): - mus = biorbd.s2mMuscleHillType.getRef(self.model.muscleGroup(mus_group_idx).muscle(mus_idx)) + mus = biorbd.HillType.getRef(self.model.muscleGroup(mus_group_idx).muscle(mus_idx)) x_axis, all_q = self.__generate_x_axis(q_idx) passive_forces = np.ndarray(x_axis.shape) for i, q_mod in enumerate(all_q): @@ -233,8 +233,8 @@ def __get_passive_forces(self, q_idx, mus_group_idx, mus_idx, _): return x_axis, passive_forces def __get_active_forces(self, q_idx, mus_group_idx, mus_idx, _): - mus = biorbd.s2mMuscleHillType.getRef(self.model.muscleGroup(mus_group_idx).muscle(mus_idx)) - emg = biorbd.s2mMuscleStateActual(0, self.active_forces_slider.value()/100) + mus = biorbd.HillType.getRef(self.model.muscleGroup(mus_group_idx).muscle(mus_idx)) + emg = biorbd.StateDynamics(0, self.active_forces_slider.value()/100) x_axis, all_q = self.__generate_x_axis(q_idx) active_forces = np.ndarray(x_axis.shape) for i, q_mod in enumerate(all_q): diff --git a/BiorbdViz/biorbd_vtk.py b/BiorbdViz/biorbd_vtk.py index d462b39..dbcb711 100644 --- a/BiorbdViz/biorbd_vtk.py +++ b/BiorbdViz/biorbd_vtk.py @@ -830,9 +830,9 @@ def update_rt(self, all_rt): # Update the end points of the axes and the origin pts = vtkPoints() pts.InsertNextPoint(rt.translation()) - pts.InsertNextPoint(rt.translation() + rt[0:3, 0] * self.rt_length) - pts.InsertNextPoint(rt.translation() + rt[0:3, 1] * self.rt_length) - pts.InsertNextPoint(rt.translation() + rt[0:3, 2] * self.rt_length) + pts.InsertNextPoint(rt.translation() + rt[0:3, 0, :] * self.rt_length) + pts.InsertNextPoint(rt.translation() + rt[0:3, 1, :] * self.rt_length) + pts.InsertNextPoint(rt.translation() + rt[0:3, 2, :] * self.rt_length) # Update polydata in mapper lines_poly_data = self.rt_actors[i].GetMapper().GetInput()