diff --git a/fmriprep/interfaces/confounds.py b/fmriprep/interfaces/confounds.py index c58174978..b59b11534 100644 --- a/fmriprep/interfaces/confounds.py +++ b/fmriprep/interfaces/confounds.py @@ -47,8 +47,8 @@ traits, ) from nipype.utils.filemanip import fname_presuffix -from niworkflows.utils.timeseries import _cifti_timeseries, _nifti_timeseries from nireports.reportlets.modality.func import fMRIPlot +from niworkflows.utils.timeseries import _cifti_timeseries, _nifti_timeseries LOGGER = logging.getLogger('nipype.interface') diff --git a/fmriprep/workflows/bold/confounds.py b/fmriprep/workflows/bold/confounds.py index b781c183f..7147a81ef 100644 --- a/fmriprep/workflows/bold/confounds.py +++ b/fmriprep/workflows/bold/confounds.py @@ -146,6 +146,7 @@ def init_bold_confs_wf( Mask of brain edge voxels """ + from nireports.interfaces.nuisance import CompCorVariancePlot, ConfoundsCorrelationPlot from niworkflows.engine.workflows import LiterateWorkflow as Workflow from niworkflows.interfaces.confounds import ExpandModel, SpikeRegressors from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms @@ -154,10 +155,6 @@ def init_bold_confs_wf( from niworkflows.interfaces.nibabel import ApplyMask, Binarize from niworkflows.interfaces.patches import RobustACompCor as ACompCor from niworkflows.interfaces.patches import RobustTCompCor as TCompCor - from nireports.interfaces.nuisance import ( - CompCorVariancePlot, - ConfoundsCorrelationPlot, - ) from niworkflows.interfaces.reportlets.masks import ROIsPlot from niworkflows.interfaces.utility import TSV2JSON, AddTSVHeader, DictMerge diff --git a/fmriprep/workflows/bold/t2s.py b/fmriprep/workflows/bold/t2s.py index 2c17c5840..1462023d8 100644 --- a/fmriprep/workflows/bold/t2s.py +++ b/fmriprep/workflows/bold/t2s.py @@ -168,10 +168,10 @@ def init_t2s_reporting_wf(name: str = 't2s_reporting_wf'): a before/after figure comparing the reference BOLD image and T2\* map """ from nipype.pipeline import engine as pe - from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms from nireports.interfaces.reporting.base import ( SimpleBeforeAfterRPT as SimpleBeforeAfter, ) + from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms workflow = pe.Workflow(name=name)