Merge pull request #5611 from kthyng/update-colormap-user-page

tacaswell · tacaswell · commit 896d089c1ea0 · 2015-12-03T16:38:17.000-05:00
Update colormap user page
diff --git a/doc/users/colormaps.rst b/doc/users/colormaps.rst
@@ -126,19 +126,6 @@ extension on this idea at [mycarta-jet]_.
 
 .. plot:: users/plotting/colormaps/lightness.py
 
-
-:math:`L^*` function
-====================
-
-There are multiple approaches to finding the best function for :math:`L^*`
-across a colormap. Linear gives reasonable results (*e.g.*, [mycarta-banding]_,
-[mycarta-lablinear]_). However, the Weber-Fechner law, and more generally and
-recently, Stevens' Law, indicates that a logarithmic or geometric relationship
-might be better (see effort on this front at [mycarta-cubelaw]_).
-
-.. plot:: users/plotting/colormaps/Lfunction.py
-
-
 Grayscale conversion
 ====================
 
diff --git a/doc/users/plotting/colormaps/Lfunction.py b/doc/users/plotting/colormaps/Lfunction.py
diff --git a/doc/users/plotting/colormaps/grayscale.py b/doc/users/plotting/colormaps/grayscale.py
@@ -3,8 +3,6 @@
 Uses lightness L* as a proxy for grayscale value.
 '''
 
-import colorconv as color
-
 from colormaps import cmaps
 
 #from skimage import color
@@ -14,6 +12,7 @@
 import matplotlib.pyplot as plt
 from matplotlib import cm
 import matplotlib as mpl
+from colorspacious import cspace_converter
 
 mpl.rcParams.update({'font.size': 14})
 mpl.rcParams['font.sans-serif'] = ('Arev Sans, Bitstream Vera Sans, '
@@ -48,8 +47,8 @@ def plot_color_gradients(cmap_category, cmap_list):
         # Get rgb values for colormap
         rgb = cm.get_cmap(plt.get_cmap(name))(x)[np.newaxis,:,:3]
 
-        # Get colormap in CIE LAB. We want the L here.
-        lab = color.rgb2lab(rgb)
+        # Get colormap in CAM02-UCS colorspace. We want the lightness.
+        lab = cspace_converter("sRGB1", "CAM02-UCS")(rgb)
         L = lab[0,:,0]
         L = np.float32(np.vstack((L, L, L)))
 
