Merge pull request #552 from fazledyn-or/Fix_Improper_Method_Call

matthew-brett · web-flow · commit f9b03f9d94e5 · 2023-11-23T00:11:01.000Z
ENH: Replace saving mayavi figure to a temporary file with mlab.screenshot()
diff --git a/nipy/labs/viz_tools/activation_maps.py b/nipy/labs/viz_tools/activation_maps.py
@@ -173,14 +173,14 @@ def plot_map(map, affine, cut_coords=None, anat=None, anat_affine=None,
         if do3d == 'interactive':
             offscreen = False
 
-        cmap = kwargs.get('cmap', plt.cm.cmap_d[plt.rcParams['image.cmap']])
+        cmap = imshow_kwargs.get('cmap', plt.get_cmap(plt.rcParams['image.cmap']))
         # Computing vmin and vmax is costly in time, and is needed
         # later, so we compute them now, and store them for future
         # use
-        vmin = kwargs.get('vmin', map.min())
-        kwargs['vmin'] = vmin
-        vmax = kwargs.get('vmax', map.max())
-        kwargs['vmax'] = vmax
+        vmin = imshow_kwargs.get('vmin', map.min())
+        imshow_kwargs['vmin'] = vmin
+        vmax = imshow_kwargs.get('vmax', map.max())
+        imshow_kwargs['vmax'] = vmax
         try:
             from mayavi import mlab
         except ImportError:
diff --git a/nipy/labs/viz_tools/edge_detect.py b/nipy/labs/viz_tools/edge_detect.py
@@ -30,7 +30,7 @@ def _fast_abs_percentile(map, percentile=80):
         return quantile(map, .01*percentile)
     map.sort()
     nb = map.size
-    return map[.01*percentile*nb]
+    return map[int(.01*percentile*nb)]
 
 
 def _orientation_kernel(t):
diff --git a/nipy/labs/viz_tools/maps_3d.py b/nipy/labs/viz_tools/maps_3d.py
@@ -117,15 +117,18 @@ def m2screenshot(mayavi_fig=None, mpl_axes=None, autocrop=True):
     if mpl_axes is not None:
         plt.axes(mpl_axes)
 
-    filename = tempfile.mktemp('.png')
-    mlab.savefig(filename, figure=mayavi_fig)
-    image3d = plt.imread(filename)
+    # XXX: This is a hack to force Mayavi to render.
+    # It should not be needed if a GUI loop is running,
+    # but just to be safe...
+    # https://github.com/enthought/mayavi/issues/702
+    mayavi_fig.scene._lift()
+
+    image3d = mlab.screenshot(figure=mayavi_fig)
     if autocrop:
         bg_color = mayavi_fig.scene.background
         image3d = autocrop_img(image3d, bg_color)
     plt.imshow(image3d)
     plt.axis('off')
-    os.unlink(filename)
     # XXX: Should switch back to previous MPL axes: we have a side effect
     # here.
 
