Updated to PyQT6 and added choices of graphs in muscle analyses

Author: pariterre

bioviz/analyses/c3d_editor_analyses.py

@@ -3,7 +3,7 @@
 from typing import Callable
 
 import ezc3d
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QBoxLayout,
     QHBoxLayout,
     QVBoxLayout,
@@ -14,7 +14,8 @@
     QLineEdit,
     QFileDialog,
 )
-from PyQt5.QtCore import Qt
+from PyQt6.QtCore import Qt
+from PyQt6.QtGui import QColorConstants
 
 try:
     import biorbd
@@ -31,7 +32,7 @@ def __init__(self, main_window, parent: QWidget = None):
 
         # Centralize the materials
         main_layout = QVBoxLayout(self.widget)
-        main_layout.setAlignment(Qt.AlignCenter)
+        main_layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
         # Set time trial
         time_set_layout = QVBoxLayout()
@@ -46,12 +47,12 @@ def __init__(self, main_window, parent: QWidget = None):
         self.add_event_button: QWidget | None = None
         self.add_subtitle("Events setter", self.events_layout)
         self.event_colors = (
-            ("red", Qt.red),
-            ("green", Qt.green),
-            ("blue", Qt.blue),
-            ("magenta", Qt.magenta),
-            ("cyan", Qt.cyan),
-            ("yellow", Qt.yellow),
+            ("red", QColorConstants.Red),
+            ("green", QColorConstants.Green),
+            ("blue", QColorConstants.Blue),
+            ("magenta", QColorConstants.Magenta),
+            ("cyan", QColorConstants.Cyan),
+            ("yellow", QColorConstants.Yellow),
         )
         self.event_buttons = []
         self.current_event_selected = -1
@@ -60,7 +61,7 @@ def __init__(self, main_window, parent: QWidget = None):
         event_editor_layout = QVBoxLayout()
         self.add_subtitle("Event editor", event_editor_layout)
         move_event_layout = QHBoxLayout()
-        move_event_layout.setAlignment(Qt.AlignCenter)
+        move_event_layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
         self.previous_event_button = self.add_button(
             "<", layout=move_event_layout, callback=lambda _: self._select_event(-1)
         )
@@ -74,7 +75,7 @@ def __init__(self, main_window, parent: QWidget = None):
         self.current_event_text = self.add_subtitle("", layout=event_editor_layout)
         self.selected_event_name = self.add_subtitle("No event selected", event_editor_layout)
         event_change_info_layout = QHBoxLayout()
-        event_change_info_layout.setAlignment(Qt.AlignCenter)
+        event_change_info_layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
         self.selected_event_frame_text = self.add_text("Change frame: ", event_change_info_layout)
         frame_editor_layout = QVBoxLayout()
         self.selected_event_frame_edit = self.add_text("", frame_editor_layout, editable=True)
@@ -110,7 +111,7 @@ def on_activate(self):
 
     def add_subtitle(self, title, layout: QBoxLayout) -> QLabel:
         head_layout = QHBoxLayout()
-        head_layout.setAlignment(Qt.AlignCenter)
+        head_layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
         qlabel = self.add_text(title, layout=head_layout)
         layout.addLayout(head_layout)
         return qlabel

bioviz/analyses/ligament_analyses.py

@@ -2,7 +2,7 @@
 from copy import copy
 
 import numpy as np
-from PyQt5.QtWidgets import (
+from PyQt6.QtWidgets import (
     QGridLayout,
     QHBoxLayout,
     QVBoxLayout,
@@ -12,7 +12,7 @@
     QScrollArea,
     QLabel,
     QWidget,
-    QSlider,
+    QFrame,
 )
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg
 from matplotlib import pyplot as plt
@@ -117,7 +117,7 @@ def __init__(self, main_window, parent: QWidget = None, background_color=(0.5, 0
 
         radio_ligament.setLayout(ligament_layout)
         ligaments_scroll = QScrollArea()
-        ligaments_scroll.setFrameShape(0)
+        ligaments_scroll.setFrameShape(QFrame.Shape.NoFrame)
         ligaments_scroll.setWidgetResizable(True)
         ligaments_scroll.setWidget(radio_ligament)
         selector_layout.addWidget(ligaments_scroll)
@@ -168,7 +168,7 @@ def __compute_all_values(self):
             for l in range(self.model.nbLigaments()):
                 if self.checkboxes_ligament[l].isChecked():
                     lig = self.model.ligament(l)
-                    lig.updateOrientations(self.model, q_mod, 1)
+                    lig.updateOrientations(self.model, q_mod, np.zeros(self.model.nbQdot()))
                     ligaments_length_jacobian = self.model.ligamentsLengthJacobian().to_array()
 
                     length[i, l] = lig.length(self.model, q_mod, False)
@@ -186,7 +186,7 @@ def __update_specific_plot(self, canvas, ax, x, y, skip=False):
                     ax.get_lines()[m].set_data(x, y[:, m])
                 number_of_active += 1
             else:
-                ax.get_lines()[m].set_data(np.nan, np.nan)
+                ax.get_lines()[m].set_data([], [])
 
         # If there is no data skip relim and vertical bar adjustment
         if number_of_active != 0: