Update plot2d.py

proposed alternative:
- instead of having same alpha for both under and over we use individual color weights and alphas for the under/over color
- by that the extreme colors can be better adapted towards the individual colormaps, for viridis and cividis to me this is not needed but
- inferno, magma, plasma colormaps could then be handled much nicer, if people like to add them one day
- the colorwarm URL link did not work, changed to an exisiting one

Author: fs446

sfs/plot2d.py

@@ -8,26 +8,32 @@
 from . import util as _util
 
 
-def _register_cmap_clip(name, original_name, alpha):
+def _register_cmap_clip(name, original_name, col_alpha_u, col_apha_o):
     """Create a color map with "over" and "under" values."""
     cmap = _plt.get_cmap(original_name)
     cmap = cmap.with_extremes(
-        under=cmap.get_under() * [1, 1, 1, alpha],
-        over=cmap.get_over() * [1, 1, 1, alpha])
+        under=cmap.get_under() * col_alpha_u,
+        over=cmap.get_over() * col_apha_o)
     cmap.name = name
     _plt.colormaps.register(cmap=cmap)
 
 
-_register_cmap_clip('cividis_clip', 'cividis', 0.6)
-_register_cmap_clip('cividis_r_clip', 'cividis_r', 0.6)
-_register_cmap_clip('viridis_clip', 'viridis', 0.6)
-_register_cmap_clip('viridis_r_clip', 'viridis_r', 0.6)
+_register_cmap_clip('cividis_clip', 'cividis',
+                    [1, 1, 1, 0.6],[1, 1, 1, 0.1])
+_register_cmap_clip('cividis_r_clip', 'cividis_r',
+                    [1, 1, 1, 0.1], [1, 1, 1, 0.6])
+_register_cmap_clip('viridis_clip', 'viridis',
+                    [1, 1, 1, 0.6], [1, 1, 1, 0.1])
+_register_cmap_clip('viridis_r_clip', 'viridis_r',
+                    [1, 1, 1, 0.1], [1, 1, 1, 0.6])
 
 # The 'coolwarm' colormap is based on the paper
 # "Diverging Color Maps for Scientific Visualization" by Kenneth Moreland
-# http://www.sandia.gov/~kmorel/documents/ColorMaps/
-_register_cmap_clip('coolwarm_clip', 'coolwarm', 0.6)
-_register_cmap_clip('coolwarm_r_clip', 'coolwarm_r', 0.6)
+# https://www.kennethmoreland.com/color-maps/ColorMapsExpanded.pdf
+_register_cmap_clip('coolwarm_clip', 'coolwarm',
+                    [1, 1, 1, 0.5], [1, 1, 1, 0.5])
+_register_cmap_clip('coolwarm_r_clip', 'coolwarm_r',
+                    [1, 1, 1, 0.5], [1, 1, 1, 0.5])
 
 
 def _register_cmap_transparent(name, color):
@@ -176,7 +182,7 @@ def _visible_secondarysources(x0, n0, grid):
     """Determine secondary sources which lie within *grid*."""
     x, y = _util.as_xyz_components(grid[:2])
     idx = _np.where((x0[:, 0] > x.min()) & (x0[:, 0] < x.max()) &
-                   (x0[:, 1] > y.min()) & (x0[:, 1] < x.max()))
+                    (x0[:, 1] > y.min()) & (x0[:, 1] < x.max()))
     idx = _np.squeeze(idx)
 
     return x0[idx, :], n0[idx, :]