Merge pull request #17 from guiwitz/default_color

Default color to CMY
guiwitz · Apr 5, 2022 · cb12cd8 · cb12cd8
2 parents 21bad0e + 1529509
commit cb12cd8
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 50 deletions.
diff --git a/docs/first_plot.ipynb b/docs/first_plot.ipynb
diff --git a/microfilm/colorify.py b/microfilm/colorify.py
@@ -15,8 +15,8 @@ def cmaps_def(cmap_name, num_colors=256, flip_map=False):
     Parameters
     ----------
     cmap_name: str
-        Matplotlib colormap or 'pure_red', 'pure_green', 'pure_blue'
-        'pure_magenta', 'pure_cyan', 'pure_yellow'
+        {'pure_red', 'pure_green', 'pure_blue', 'pure_magenta',
+        'pure_cyan', 'pure_yellow'} or Matplotlib colormap
     num_colors: int
         number of steps in color scale
     flip_map: bool
@@ -135,7 +135,8 @@ def colorify_by_name(image, cmap_name, flip_map=False, rescale_type='min_max', l
     image: 2d array
         image to convert to RGB
     cmap_name: str
-        Matplotlib colormap or 'pure_red', 'pure_green', 'pure_blue'
+        {'pure_red', 'pure_green', 'pure_blue', 'pure_magenta',
+        'pure_cyan', 'pure_yellow'} or Matplotlib colormap
     flip_map: bool
         invert colormap
     rescale_type: str
@@ -177,8 +178,8 @@ def colorify_by_hex(image, cmap_hex='#ff6600', flip_map=False, rescale_type='min
     ----------
     image: 2d array
         image to convert to RGB
-    cmap_name: str
-        Matplotlib colormap or 'pure_red', 'pure_green', 'pure_blue'
+    cmap_hex: str
+        hex string defining color, default '#ff6600' 
     flip_map: bool
         invert colormap
     rescale_type: str
@@ -401,7 +402,7 @@ def multichannel_to_rgb(images, cmaps=None, flip_map=False, rescale_type='min_ma
         # if no colormap is provided use true RGB for d<4
         if cmaps is None:
             if len(images) < 4:
-                cmaps = ['pure_red','pure_green','pure_blue']
+                cmaps = ['pure_cyan','pure_magenta','pure_yellow']
             else:
                 cmaps = ['ran_gradient' for x in images]
 

diff --git a/notebooks/create_plots.ipynb b/notebooks/create_plots.ipynb