Small fixes with sorting and names (#29)

* Only short named in cc.cm_n

* Reordering continuous and categorical in list

* Order by columns

* Fixing up test

assets/CET_to_py.py

@@ -113,7 +113,7 @@ def check_aliases(names, d,  k_position=-1, v_position=0):
     names = check_aliases(names, aliases, k_position=-2, v_position=0)
     return ',  '.join(names)
 
-def all_original_names(group=None, not_group=None, only_aliased=False):
+def all_original_names(group=None, not_group=None, only_aliased=False, only_CET=False):
     """Get all original names - optionally in a particular group - or only those with aliases"""
     names = palette.keys()
     if group:
@@ -124,6 +124,10 @@ def all_original_names(group=None, not_group=None, only_aliased=False):
         names = filter(lambda x: x in aliases.keys(), names)
     else:
         names = filter(lambda x: x not in aliases.values(), names)
+    if only_CET:
+        names = filter(lambda x: x in mapping_flipped.values(), names)
+    else:
+        names = filter(lambda x: x not in mapping_flipped.values(), names)
     return sorted(list(names))
 
 palette = AttrODict()
@@ -237,16 +241,18 @@ def all_original_names(group=None, not_group=None, only_aliased=False):
   'linear_blue_5_95_c73': 'linear_kbc_5_95_c73',
 }
 
-def create_alias(alias, base, output):
+def create_alias(alias, base, output, is_name=True):
     output.write("{0} = b_{1}\n".format(alias,base))
     output.write("m_{0} = m_{1}\n".format(alias,base))
     output.write("m_{0}_r = m_{1}_r\n".format(alias,base))
     output.write("palette['{0}'] = b_{1}\n".format(alias,base))
-    output.write("palette_n['{0}'] = b_{1}\n".format(alias,base))
+    if is_name:
+        output.write("palette_n['{0}'] = b_{1}\n".format(alias,base))
     output.write("cm['{0}'] = m_{1}\n".format(alias,base))
     output.write("cm['{0}_r'] = m_{1}_r\n".format(alias,base))
-    output.write("cm_n['{0}'] = mpl_cm('{0}',{1})\n".format(alias,base))
-    output.write("cm_n['{0}_r'] = mpl_cm('{0}_r',list(reversed({1})))\n".format(alias,base))
+    if is_name:
+        output.write("cm_n['{0}'] = mpl_cm('{0}',{1})\n".format(alias,base))
+        output.write("cm_n['{0}_r'] = mpl_cm('{0}_r',list(reversed({1})))\n".format(alias,base))
     output.write("register_cmap('cet_{0}',m_{1})\n".format(alias,base))
     output.write("register_cmap('cet_{0}_r',m_{1}_r)\n".format(alias,base))
 
@@ -277,7 +283,7 @@ def create_alias(alias, base, output):
                   create_alias(alias, base, output)
               if base in mapping_flipped:
                   alias = mapping_flipped[base]
-                  create_alias(alias, base, output)
+                  create_alias(alias, base, output, is_name=False)
               output.write("\n\n")
               cmaps.append(base)
     output.write(footer)

colorcet/plotting.py

@@ -53,10 +53,11 @@ def swatches(*args, group=None, not_group=None, only_aliased=False, cols=None, *
         if 'width' not in kwargs:
             kwargs['width'] = (9 * kwargs['height']) // cols
 
-    plot = hv.Layout([
-        swatch(arg, **kwargs) if isinstance(arg, str) else
-        swatch(*arg, **kwargs) for
-        arg in args]).cols(cols)
+    images = [swatch(arg, **kwargs) if isinstance(arg, str) else
+              swatch(*arg, **kwargs) for
+              arg in args]
+
+    plot = hv.Layout(images).opts(plot=dict(transpose=True)).cols(int(np.ceil(len(images)*1.0/cols)))
 
     if 'matplotlib' in backends:
         plot.opts(opts.Layout(backend='matplotlib', sublabel_format=None,
@@ -84,10 +85,11 @@ def sine_combs(*args, group=None, not_group=None, only_aliased=False, cols=1, **
     """Show sine_combs for given names or names in group"""
     args = args or all_original_names(group=group, not_group=not_group,
                                       only_aliased=only_aliased)
-    plot = hv.Layout([
-        sine_comb(arg, **kwargs) if isinstance(arg, str) else
-        sine_comb(*arg, **kwargs) for
-        arg in args]).cols(cols)
+    images = [sine_comb(arg, **kwargs) if isinstance(arg, str) else
+              sine_comb(*arg, **kwargs) for
+              arg in args]
+
+    plot = hv.Layout(images).opts(plot=dict(transpose=True)).cols(int(np.ceil(len(images)*1.0/cols)))
 
     backends = hv.Store.loaded_backends()
     if 'matplotlib' in backends:

colorcet/tests/test_aliases.py

@@ -10,7 +10,7 @@ def test_get_aliases():
     assert cc.get_aliases('linear_kbc_5_95_c73') in expected
 
 def test_all_original_names():
-    assert len(cc.all_original_names()) == 135
+    assert len(cc.all_original_names()) == 79
 
 def test_all_original_names_only_aliased():
     assert len(cc.all_original_names(only_aliased=True)) == 28
@@ -19,7 +19,7 @@ def test_all_original_names_nopic():
     assert len(cc.all_original_names(group='nopic')) == 10
 
 def test_all_original_names_not_glasbey():
-    assert len(cc.all_original_names(not_group='glasbey')) == 127
+    assert len(cc.all_original_names(not_group='glasbey')) == 71
 
 def test_all_original_names_nopic_and_only_aliased():
     assert len(cc.all_original_names(group='nopic', only_aliased=True)) == 2

colorcet/tests/test_bokeh.py

@@ -3,7 +3,7 @@
 
 def test_bokeh_palettes_available():
     assert len(cc.palette.items()) == 163
-    assert len(cc.palette_n.items()) == 84
+    assert len(cc.palette_n.items()) == 28
 
 def test_bokeh_palette_is_a_list():
     assert isinstance(cc.blues, list)

colorcet/tests/test_matplotlib.py

@@ -5,7 +5,7 @@
 
 def test_matplotlib_colormaps_available():
     assert len(cc.cm.items()) == 326
-    assert len(cc.cm_n.items()) == 168
+    assert len(cc.cm_n.items()) == 56
 
 
 @pytest.mark.mpl_image_compare

doc/user_guide/index.rst

@@ -0,0 +1,24 @@
+..
+   Originally generated by nbsite (0.6.1a4):
+     /Users/jsignell/conda/envs/colorcet/bin/nbsite generate-rst --org pyviz --project-name colorcet --offset 0
+   Will not subsequently be overwritten by nbsite, so can be edited.
+   2019-04-03 jsignell: reordered categorical and continuous to not be alphabetical
+
+**********
+User Guide
+**********
+
+.. notebook:: colorcet ../../examples/user_guide/index.ipynb
+    :offset: 0
+
+.. toctree::
+    :titlesonly:
+    :maxdepth: 2
+
+    Continuous <Continuous>
+    Categorical <Categorical>
+
+
+-------
+
+`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/pyviz/colorcet/master/examples/user_guide/index.ipynb>`_

examples/user_guide/Categorical.ipynb

@@ -267,8 +267,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "swatches(group='glasbey')"
+    "swatches(group='glasbey', cols=1)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

examples/user_guide/Continuous.ipynb

@@ -195,13 +195,6 @@
    "source": [
     "sine_combs(not_group='glasbey', cols=2)"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {