Merge pull request #760 from girder/more-matplotlib-palettes

Work with more more matplotlib palettes.
girder · Jan 20, 2022 · 144034e · 144034e
2 parents 8e62ccf + 49fc1b1
commit 144034e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 ### Improvements
 - Expand user paths ([#746](../../pull/746))
+- Work with more matplotlib palettes ([#760](../../pull/760))
 
 ### Changes
 - Use importlib rather than pkg_resources internally ([#747](../../pull/747))

diff --git a/large_image/tilesource/utilities.py b/large_image/tilesource/utilities.py
@@ -460,10 +460,11 @@ def getPaletteColors(value):
         try:
             import matplotlib
 
-            palette = (
-                ['#0000', matplotlib.colors.to_hex(value)]
-                if value in matplotlib.colors.get_named_colors_mapping()
-                else matplotlib.cm.get_cmap(value).colors)
+            if value in matplotlib.colors.get_named_colors_mapping():
+                palette = ['#0000', matplotlib.colors.to_hex(value)]
+            else:
+                cmap = matplotlib.cm.get_cmap(value)
+                palette = [matplotlib.colors.to_hex(cmap(i)) for i in range(cmap.N)]
         except (ImportError, ValueError, AttributeError):
             pass
     if palette is None:

diff --git a/test/test_source_base.py b/test/test_source_base.py
@@ -164,6 +164,7 @@ def testIsGeospatial(filename, isgeo):
     'viridis',
     'matplotlib.Plasma_6',
     [(0.5, 0.5, 0.5), (0.1, 0.1, 0.1, 0.1), 'xkcd:blue'],
+    'coolwarm',
 ])
 def testGoodGetPaletteColors(palette):
     large_image.tilesource.utilities.getPaletteColors(palette)