[circle full] extend to plot_surf

nilearn/plotting/displays.py

@@ -1199,7 +1199,7 @@ def _get_cbar_ticks(vmin, vmax, offset, nb_ticks=5):
     # If the threshold is very small compared to vmax, we use
     # a simple linspace as the result would be very difficult to see.
     ticks = np.linspace(vmin, vmax, nb_ticks)
-    if offset / vmax > 0.12:
+    if offset is not None and offset / vmax > 0.12:
         diff = [abs(abs(tick) - offset) for tick in ticks]
         # Edge case where the thresholds are exactly at
         # the same distance to 4 ticks

nilearn/plotting/surf_plotting.py

@@ -6,6 +6,7 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
+import warnings
 
 from matplotlib import gridspec
 from matplotlib.colorbar import make_axes
@@ -359,9 +360,14 @@ def custom_function(vertices):
                 ticks = np.arange(vmin, vmax + 1)
                 nb_ticks = len(ticks)
             else:
-                ticks = np.linspace(vmin, vmax, nb_ticks)
+                from nilearn.plotting.displays import _get_cbar_ticks
+                ticks = _get_cbar_ticks(vmin, vmax, threshold, nb_ticks)
             bounds = np.linspace(vmin, vmax, our_cmap.N)
             if threshold is not None:
+                if cbar_tick_format == "%i" and int(threshold) != threshold:
+                    warnings.warn("You provided a non integer threshold "
+                                  "but configured the colorbar to use "
+                                  "integer formatting.")
                 cmaplist = [our_cmap(i) for i in range(our_cmap.N)]
                 # set colors to grey for absolute values < threshold
                 istart = int(norm(-threshold, clip=True) * (our_cmap.N - 1))