New cmap

lukelbd · lukelbd · commit 96329f8a1eb5 · 2019-03-20T17:33:04.000-06:00
diff --git a/docs/showcase.rst b/docs/showcase.rst
@@ -1543,7 +1543,7 @@ for usage details.
 
 .. image:: showcase/showcase_100_1.png
    :width: 436px
-   :height: 4383px
+   :height: 4409px
 
 
 Table of color cycles
diff --git a/docs/showcase/showcase_100_1.png b/docs/showcase/showcase_100_1.png
diff --git a/proplot/cmaps/Dusk.json b/proplot/cmaps/Dusk.json
@@ -0,0 +1,53 @@
+{
+    "hue": [
+        [
+            0.0,
+            233.561001627876,
+            233.561001627876
+        ],
+        [
+            1.0,
+            282.6114815967624,
+            282.6114815967624
+        ]
+    ],
+    "saturation": [
+        [
+            0.0,
+            100.0,
+            100.0
+        ],
+        [
+            1.0,
+            100.0,
+            100.0
+        ]
+    ],
+    "luminance": [
+        [
+            0.0,
+            100.0,
+            100.0
+        ],
+        [
+            1.0,
+            10.0,
+            10.0
+        ]
+    ],
+    "alpha": [
+        [
+            0.0,
+            1.0,
+            1.0
+        ],
+        [
+            1.0,
+            1.0,
+            1.0
+        ]
+    ],
+    "gamma1": 1.0,
+    "gamma2": 1.0,
+    "space": "hpl"
+}
diff --git a/proplot/colortools.py b/proplot/colortools.py
@@ -306,7 +306,8 @@
 
     # Custom maps
     'ProPlot Sequential': [
-         'Glacial',
+        'Glacial',
+        'Dusk',
         'Bog', 'Verdant',
         'Turquoise',
         'Sunrise', 'Sunset', 'Fire',
@@ -896,8 +897,8 @@ def _clip_cmap(cmap, left=None, right=None, N=None):
         left = 0
     if right is None:
         right = 1
-    if hasattr(cmap, 'space'):
-        kwargs['space'] = cmap.space
+    if hasattr(cmap, '_space'):
+        kwargs['space'] = cmap._space
     # Next resample the segmentdata arrays
     dict_ = {key:value for key,value in data.items() if
             key not in ('gamma1','gamma2')}
@@ -1393,9 +1394,9 @@ def Colormap(*args, name=None, cyclic=False, N=None,
             filename = os.path.join(_data_user, basename)
             data = {}
             for key,value in cmap._segmentdata.items():
-                data[key] = value.astype(float).tolist() # from np.float to builtin float, and to list of lists
-            if hasattr(cmap, 'space'):
-                data['space'] = cmap.space
+                data[key] = np.array(value).astype(float).tolist() # from np.float to builtin float, and to list of lists
+            if hasattr(cmap, '_space'):
+                data['space'] = cmap._space
             with open(filename, 'w') as file:
                 json.dump(data, file, indent=4)
         print(f'Saved colormap to "{basename}".')
