Merge pull request #33 from Brain-Modulation-Lab/enh/reports-graphics

Enh/reports graphics
Improved graphs in the reports

Author: Lucia-Poma

pyproject.toml

@@ -25,8 +25,8 @@ dependencies = [
     "python-docx>=1.1",
     "docx2pdf>=0.1.8",
     "pydantic>=2.0",
-    "pyqtgraph>=0.14.0",
     "pyside6>=6.11.0",
+    "matplotlib>=3.5",
 ]
 
 [dependency-groups]

src/clinical_dbs_annotator/config/clinical_presets.json

@@ -1,30 +1,30 @@
 {
-  "Dystonia": [
-    "BFMDRS",
-    "TWSTRS"
-  ],
-  "ET": [
-    "FTM-TRS",
-    "TETRAS"
-  ],
-  "MDD": [
-    "MADRS",
-    "HAM-D",
-    "BDI-II"
-  ],
   "OCD": [
     "Y-BOCS",
     "Y-BOCS-o",
     "Y-BOCS-c",
     "MADRS",
     "OCI-R"
   ],
+  "MDD": [
+    "MADRS",
+    "HAM-D",
+    "BDI-II"
+  ],
   "PD": [
     "MDS-UPDRS",
     "UPDRS-III",
     "PDQ-39",
     "UDysRS"
   ],
+  "ET": [
+    "FTM-TRS",
+    "TETRAS"
+  ],
+  "Dystonia": [
+    "BFMDRS",
+    "TWSTRS"
+  ],
   "TS": [
     "YGTSS",
     "PUTS",

src/clinical_dbs_annotator/controllers/wizard_controller.py

@@ -684,6 +684,7 @@ def export_longitudinal_report(
         fmt: str,
         parent_widget=None,
         sections=None,
+        clinical_scale_prefs: list | None = None,
     ) -> None:
         """
         Generate a longitudinal report combining data from multiple TSV files.
@@ -693,11 +694,14 @@ def export_longitudinal_report(
             scale_prefs: Scale optimization prefs [(name, min, max, mode, custom_value), ...]
             fmt: "word" or "pdf"
             parent_widget: Parent widget for dialogs
+            sections: List of section keys to include
+            clinical_scale_prefs: Clinical scale prefs, same format as scale_prefs
         """
         from ..utils.longitudinal_exporter import LongitudinalExporter
 
         exporter = LongitudinalExporter()
         exporter.set_scale_optimization_prefs(scale_prefs)
+        exporter.set_clinical_scale_prefs(clinical_scale_prefs)
 
         if fmt == "word":
             exporter.export_to_word(file_paths, parent_widget, sections=sections)