girishmm
diff --git a/‎.coveragerc
+2-1 b/‎.coveragerc
+2-1
diff --git a/‎Makefile
-1 b/‎Makefile
-1
diff --git a/‎codecov.yml
+2 b/‎codecov.yml
+2
diff --git a/‎doc/conf.py
+7-1 b/‎doc/conf.py
+7-1
diff --git a/‎doc/images/niftimasker_report.png
94.9 KB b/‎doc/images/niftimasker_report.png
94.9 KB
diff --git a/‎doc/images/niftimasker_report_params.png
91.4 KB b/‎doc/images/niftimasker_report_params.png
91.4 KB
diff --git a/‎doc/manipulating_images/masker_objects.rst
+23-9 b/‎doc/manipulating_images/masker_objects.rst
+23-9
diff --git a/‎doc/themes/nilearn/static/nature.css_t
+19 b/‎doc/themes/nilearn/static/nature.css_t
+19
@@ -1,4 +1,5 @@
 [run]
 branch = True
 parallel = True
-
+omit =
+    */nilearn/externals/*
@@ -63,4 +63,3 @@ doc:
 .PHONY : pdf
 pdf:
 	make -C doc pdf
-
@@ -0,0 +1,2 @@
+ignore:
+  - "*externals/.*"  # ignore folders and all its contents
@@ -281,6 +281,11 @@
 
 _python_doc_base = 'http://docs.python.org/3.6'
 
+# Scraper, copied from https://github.com/mne-tools/mne-python/
+from nilearn.reporting import _ReportScraper
+report_scraper = _ReportScraper()
+scrapers = ('matplotlib', report_scraper)
+
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'python': (_python_doc_base, None),
@@ -302,6 +307,7 @@
     'backreferences_dir': os.path.join('modules', 'generated'),
     'reference_url': {'nilearn': None},
     'junit': '../test-results/sphinx-gallery/junit.xml',
+    'image_scrapers': scrapers,
     }
 
 # Get rid of spurious warnings due to some interaction between
@@ -310,7 +316,6 @@
 # details
 numpydoc_show_class_members = False
 
-
 def touch_example_backreferences(app, what, name, obj, options, lines):
     # generate empty examples files, so that we don't get
     # inclusion errors if there are no examples for a class / module
@@ -327,3 +332,4 @@ def touch_example_backreferences(app, what, name, obj, options, lines):
 def setup(app):
     app.add_javascript('copybutton.js')
     app.connect('autodoc-process-docstring', touch_example_backreferences)
+    report_scraper.app = app
@@ -136,12 +136,25 @@ mask computation parameters.
 The mask can be retrieved and visualized from the `mask_img_` attribute
 of the masker:
 
+.. literalinclude:: ../../examples/04_manipulating_images/plot_mask_computation.py
+    :start-after: # A NiftiMasker with the default strategy
+    :end-before: # Plot the generated mask using the .generate_report method
+
+.. figure:: ../auto_examples/04_manipulating_images/images/sphx_glr_plot_mask_computation_002.png
+    :target: ../auto_examples/04_manipulating_images/plot_mask_computation.html
+    :align: center
+    :scale: 40
+
+Alternatively, the mask can be visualized using the `generate_report`
+method of the masker. The generated report can be viewed in a Jupyter notebook,
+opened in a new browser tab using `report.open_in_browser()`,
+or saved as a portable HTML file `report.save_as_html(output_filepath)`.
+
 .. literalinclude:: ../../examples/04_manipulating_images/plot_mask_computation.py
     :start-after: # We need to specify an 'epi' mask_strategy, as this is raw EPI data
     :end-before: # Generate mask with strong opening
 
-
-.. figure:: ../auto_examples/04_manipulating_images/images/sphx_glr_plot_mask_computation_004.png
+.. figure:: /images/niftimasker_report.png
     :target: ../auto_examples/04_manipulating_images/plot_mask_computation.html
     :scale: 50%
 
@@ -163,7 +176,7 @@ Controling these arguments set the fine aspects of the mask. See the
 functions documentation, or :doc:`the NiftiMasker example
 <../auto_examples/04_manipulating_images/plot_mask_computation>`.
 
-.. figure:: ../auto_examples/04_manipulating_images/images/sphx_glr_plot_mask_computation_005.png
+.. figure:: /images/niftimasker_report_params.png
     :target: ../auto_examples/04_manipulating_images/plot_mask_computation.html
     :scale: 50%
 
@@ -180,9 +193,10 @@ preparation::
    >>> masker # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
    NiftiMasker(detrend=False, dtype=None, high_pass=None, low_pass=None,
          mask_args=None, mask_img=None, mask_strategy='background',
-         memory=Memory(...), memory_level=1, sample_mask=None,
-         sessions=None, smoothing_fwhm=None, standardize=False, t_r=None,
-         target_affine=None, target_shape=None, verbose=0)
+         memory=Memory(...), memory_level=1, reports=True,
+         sample_mask=None, sessions=None, smoothing_fwhm=None,
+         standardize=False, t_r=None, target_affine=None, target_shape=None,
+         verbose=0)
 
 .. note::
 
@@ -234,15 +248,15 @@ Temporal Filtering and confound removal
 properties, before conversion to voxel signals.
 
 - **Standardization**. Parameter ``standardize``: Signals can be
-  standardized (scaled to unit variance). 
+  standardized (scaled to unit variance).
 
 - **Frequency filtering**. Low-pass and high-pass filters can be used to
   remove artifacts. Parameters: ``high_pass`` and ``low_pass``, specified
   in Hz (note that you must specific the sampling rate in seconds with
   the ``t_r`` parameter: ``loss_pass=.5, t_r=2.1``).
 
 - **Confound removal**. Two ways of removing confounds are provided: simple
-  detrending or using prespecified confounds, such as behavioral or movement 
+  detrending or using prespecified confounds, such as behavioral or movement
   information.
 
   * Linear trends can be removed by activating the `detrend` parameter.
@@ -251,7 +265,7 @@ properties, before conversion to voxel signals.
     signal of interest (e.g., the neural correlates of cognitive tasks).
     It is not activated by default in :class:`NiftiMasker` but is recommended
     in almost all scenarios.
-    
+
   * More complex confounds, measured during the acquision, can be removed
     by passing them to :meth:`NiftiMasker.transform`. If the dataset
     provides a confounds file, just pass its path to the masker.
 
@@ -1689,3 +1689,22 @@ ul#tab li div.contents p{
 p.sphx-glr-horizontal {
     margin-top: 2em;
 }
+
+
+/* Sphinx-gallery Report embedding */
+div.sg-report {
+    padding: 0pt;
+    transform: scale(.95);
+}
+
+div.sg-report iframe {
+    display: block;
+    border-style: none;
+    transform: scale(.85);
+    height: 470px;
+    margin-left: -12%; /* Negative because of .8 scaling */
+    margin-top: -4%;
+    padding: 0pt;
+    margin-bottom: 0pt;
+    width: 126%; /* More than 100% because of .8 scaling */
+}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ignore:`
	`2`	`+ - "externals/." # ignore folders and all its contents`