maint: port nipreps/niworkflows#785

Co-Authored-By: Chris Markiewicz <[email protected]>
nipreps · Mar 10, 2023 · ffe9f20 · ffe9f20
1 parent 551b578
commit ffe9f20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/nireports/reportlets/mosaic.py b/nireports/reportlets/mosaic.py
@@ -129,7 +129,7 @@ def plot_registration(
 
     # FreeSurfer ribbon.mgz
     if contour:
-        contour = nb.Nifti1Image.from_image(anat_nii)
+        contour = nb.Nifti1Image.from_image(contour)
 
     ribbon = contour is not None and np.array_equal(
         np.unique(contour.get_fdata()), [0, 2, 3, 41, 42]

diff --git a/nireports/reportlets/xca.py b/nireports/reportlets/xca.py
@@ -76,13 +76,16 @@ def plot_melodic_components(
         is printed at the top.
 
     """
-    from nilearn.image import index_img, iter_img
+    import os
     import numpy as np
+    from matplotlib.gridspec import GridSpec
     import pylab as plt
     import seaborn as sns
-    from matplotlib.gridspec import GridSpec
-    from nilearn.input_data import NiftiMasker
-    import os
+    from nilearn.image import index_img, iter_img
+    try:
+        from nilearn.maskers import NiftiMasker
+    except ImportError:  # nilearn < 0.9
+        from nilearn.input_data import NiftiMasker
 
     sns.set_style("white")
     current_palette = sns.color_palette()