mergechannels 0.1.2__cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl → 0.2.0__cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl

mergechannels/__init__.py

@@ -1,13 +1,13 @@
 # Import Rust functions
 from .mergechannels import (  # type: ignore
-	apply_color_map,
-	apply_colors_and_merge_nc,
+	dispatch_single_channel,
+	dispatch_multi_channel,
 )
-
 from ._internal import merge
 
+
 __all__ = [
-	'apply_color_map',
-	'apply_colors_and_merge_nc',
+	'dispatch_single_channel',
+	'dispatch_multi_channel',
 	'merge',
 ]

mergechannels/__init__.pyi

@@ -1,27 +1,30 @@
-from typing import Sequence, Literal
 
+from typing import Literal, Sequence
 import numpy as np
 
-from ._luts import COLORMAPS
-from ._blending import BLENDING_OPTIONS
+from python.mergechannels._blending import BLENDING_OPTIONS
+from python.mergechannels._luts import COLORMAPS
+
 
 def merge(
-	arrs: Sequence[np.ndarray],
-	colors: Sequence[COLORMAPS] = (),
-	blending: Literal[BLENDING_OPTIONS] = 'max',
+    arrs: np.ndarray | Sequence[np.ndarray],
+    colors: Sequence[COLORMAPS] = (),
+    blending: Literal[BLENDING_OPTIONS] = 'max',
     saturation_limits: tuple[float, float] = (0.2, 99.8),
 ) -> np.ndarray:
     ...
 
-def apply_color_map(
-    arr: np.ndarray,
-    cmap_name: COLORMAPS,
-    saturation_limits: tuple[float, float] = (0.2, 99.8),
-) -> np.ndarray: ...
+def dispatch_single_channel(
+    array_reference: np.ndarray,
+    cmap_name: str,
+    limits: tuple[float, float],
+) -> np.ndarray:
+    ...
 
-def apply_colors_and_merge_nc(
-    arrs: Sequence[np.ndarray],
-    colors: Sequence[COLORMAPS] = (),
-    blending: Literal[BLENDING_OPTIONS] = 'max',
-    saturation_limits: Sequence[tuple[float, float]] = (),
-) -> np.ndarray: ...
+def dispatch_multi_channel(
+    array_references: Sequence[np.ndarray],
+    cmap_names: Sequence[str],
+    blending: Literal[BLENDING_OPTIONS],
+    limits: Sequence[tuple[float, float]],
+) -> np.ndarray:
+    ...

mergechannels/_internal.py

@@ -3,8 +3,8 @@ from typing import Sequence
 import numpy as np
 
 from mergechannels import (
-	apply_color_map,
-	apply_colors_and_merge_nc,
+	dispatch_single_channel,
+	dispatch_multi_channel,
 )
 from ._luts import COLORMAPS
 from ._blending import BLENDING_OPTIONS
@@ -13,6 +13,7 @@ def merge(
 	arrs: Sequence[np.ndarray],
 	colors: Sequence[COLORMAPS],
 	blending: BLENDING_OPTIONS = 'max',
+    saturation_limits: tuple[float, float] = (0.011, 0.999),
 ) -> np.ndarray:
 	'''
 	apply cmaps to arrays and blend the colors
@@ -30,9 +31,9 @@ def merge(
 		raise ValueError(
 			f'Expected every array to have the same shape, got {arr_shapes}'
 		)
-	if not len(arr_shapes[0]) == 2:
+	if len(arr_shapes[0]) not in (2, 3):
 		raise ValueError(
-			f'Expected every array to be 2D, got {arr_shapes[0]}'
+			f'Expected every array to be 2D or 3D, got {arr_shapes[0]}'
 		)
 	arr_dtypes = [arr.dtype for arr in arrs]
 	if not len(set(arr_dtypes)) == 1:
@@ -40,8 +41,25 @@ def merge(
 			f'Expected every array to have the same dtype, got {arr_dtypes}'
 		)
 	# endregion
-
 	if n_arrs == 1:
-		return apply_color_map(arr=arrs[0], cmap_name=colors[0])
+		if arrs[0].dtype == 'uint8':
+			limits = (0, 255)
+		else:
+			low, high = np.percentile(arrs[0], np.array(saturation_limits) * 100)
+			limits = (low, high)
+		return dispatch_single_channel(
+			array_reference=arrs[0],
+			cmap_name=colors[0],
+			limits=limits,
+		)
 	else:
-		return apply_colors_and_merge_nc(arrs, colors, blending)
+		if all(arr.dtype == 'uint8' for arr in arrs):
+			limits = (0, 255)
+		else:
+			limits = tuple(np.percentile(arr, np.array(saturation_limits) * 100) for arr in arrs)
+		return dispatch_multi_channel(
+			array_references=arrs,
+			cmap_names=colors,
+			blending=blending,
+			limits=limits,  # type: ignore
+		)

{mergechannels-0.1.2.dist-info → mergechannels-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mergechannels
-Version: 0.1.2
+Version: 0.2.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -12,7 +12,10 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: numpy>1.25.0
+Provides-Extra: nvim
 License-File: LICENSE
+Summary: Apply and merge colormaps
+Author-email: Zac Swider <zac.swider@gmail.com>
 License: MIT
 Requires-Python: >=3.9, <=3.13
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
@@ -60,8 +63,7 @@ plt.show()
 print(colorized.shape, colorized.dtype)
 >> (512, 512, 3) uint8
 ```
-![colorize a single image](https://raw.githubusercontent.com/zacswider/README_Images/main/camera_red-green.png
-)
+![colorize a single image](https://raw.githubusercontent.com/zacswider/README_Images/main/camera_red-green.png)
 
 
 ### apply a different colormap to each channel
@@ -71,38 +73,66 @@ import matplotlib.pyplot as plt
 import mergechannels as mc
 
 cells, nuclei = data.cells3d().max(axis=0)
-cells = to_uint8(cells)     # normalize your own arrays, mergechannels doesn't currently handle this
-nuclei = to_uint8(nuclei)   # normalize your own arrays, mergechannels doesn't currently handle this
+assert cells.dtype == 'uint16' and nuclei.dtype == 'uint16'
+fig, axes = plt.subplots(1, 2, figsize=(3, 6), dpi=300)
+for ax in axes.ravel(): ax.axis('off')
+(a, b) = axes.ravel()
+a.imshow(mc.merge([cells, nuclei],['Orange Hot', 'Cyan Hot']))
+b.imshow(mc.merge([cells, nuclei],['I Blue', 'I Forest'], blending='min'))
+fig.tight_layout()
+plt.show()
+```
+![max and min multicolor blending](https://raw.githubusercontent.com/zacswider/README_Images/main/overlay_normal_and_inverted.png)
 
-fig, axes = plt.subplots(2, 2, figsize=(6, 6), dpi=150)
+### apply a colormap to a whole stack
+```python
+from skimage import data
+from matplotlib import pyplot as plt
+import mergechannels as mc
+
+volume = data.cells3d()
+cells = volume[:, 0]
+nuclei = volume[:, 1]
+merged = mc.merge([cells, nuclei],['Orange Hot', 'Cyan Hot'])
+plt.imshow(merged[24]); plt.show()
+```
+![colorize a whole stack of images](https://raw.githubusercontent.com/zacswider/README_Images/main/merged_stacks.png)
+
+### adjust the saturation limits when applying colormaps
+``` python
+from skimage import data
+import matplotlib.pyplot as plt
+import mergechannels as mc
+
+cells, nuclei = data.cells3d().max(axis=0)
+channels = [cells, nuclei]
+colormaps = ['I Blue', 'I Forest']
+fig, axes = plt.subplots(1, 2, figsize=(3, 6), dpi=300)
 for ax in axes.ravel(): ax.axis('off')
-(a, b, c, d) = axes.ravel()
-a.imshow(cells, cmap='gray')
-b.imshow(nuclei, cmap='gray')
-c.imshow(
-    mc.merge(
-        [cells, nuclei],
-        ['Orange Hot', 'Cyan Hot'],  # maximum blending is the default
-    ),
-)
-d.imshow(
+(a, b) = axes.ravel()
+a.imshow(mc.merge(channels, colormaps, blending='min'))
+b.imshow(
     mc.merge(
-        [cells, nuclei],
-        ['I Blue', 'I Forest'],
-        blending='min',     # use minimum blending with inverted colormaps
+        channels,
+        colormaps,
+        blending='min',
+        saturation_limits=(
+            0.01,  # bottom 1% of pixels set to black point
+            0.97,  # top 3% of pixels set to white point
+        ),
     ),
 )
 fig.tight_layout()
 plt.show()
 ```
-![max and min multicolor blending](https://raw.githubusercontent.com/zacswider/README_Images/main/cells_multicolor.png)
+![adjust saturation limits](https://raw.githubusercontent.com/zacswider/README_Images/main/adjust_sat_lims.png)
 
 
 ## Roadmap
-mergechannels is currently incredibly simple. It can apply one or more colormaps to one or more 2D 8-bit images and that's it.
+mergechannels is currently incredibly simple. It can apply one or more colormaps to one or more 2D and 3D 8-bit or 16-bit images and that's it.
 - Add support for any numerical dtype
-- Add support for 3D images
 - Add option to return any colormap as a matplotlib colormap
+- Add option to pass external colormaps to mergechannels
 - Add support for directly passing matplotlib colormaps instead of colormap names
 - Parallelize colormap application on large images (if it's helpful)
 - Add option to overlay binary or instance masks onto colorized images

mergechannels-0.2.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+mergechannels-0.2.0.dist-info/METADATA,sha256=t-okrnqyvIiZxuLqTlubmCkXCxKz9U43u7bhSIEiNBc,5725
+mergechannels-0.2.0.dist-info/WHEEL,sha256=AgRYdierwji5LMigdvW4USDs9NpHbQb5qmtuwZjCN3o,129
+mergechannels-0.2.0.dist-info/licenses/LICENSE,sha256=csvD60rgtSorbYEM3f8867qNyPCzmIXyFNj8h01Bd6c,1071
+mergechannels/__init__.py,sha256=TTNiDGOOJ6_-yR-qvX_nXph646Sz6-MEORc8ItksCRE,232
+mergechannels/__init__.pyi,sha256=tiDx6v14J0cedFdk6fzVRRyA21b4Z8eB_rtSTUjI804,749
+mergechannels/_blending.py,sha256=mE5Cr9wvVJRcwfymg_UUZUjdIKx2mldfLU8QJT95bVM,84
+mergechannels/_internal.py,sha256=ZcdBUFEq8k2Ve_ASOZLTuPBaFEEPqadc9LqAGmBqOas,1773
+mergechannels/_luts.py,sha256=DxwCMBnAAJc1ZX-D4cq8HabW-sLuBQpUqOWMWXqt_84,1035
+mergechannels/mergechannels.cpython-39-powerpc64le-linux-gnu.so,sha256=pV91QYI7yq11iMpUHnjuzMLFUicyGAUtmpmiUBA3D-o,1340768
+mergechannels/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mergechannels-0.2.0.dist-info/RECORD,,

{mergechannels-0.1.2.dist-info → mergechannels-0.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.8.3)
+Generator: maturin (1.8.6)
 Root-Is-Purelib: false
 Tag: cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le

mergechannels-0.1.2.dist-info/RECORD

@@ -1,11 +0,0 @@
-mergechannels-0.1.2.dist-info/METADATA,sha256=fdx3XuAlrCeScx655leoDJJEMtrZQ2-K2tX--JalIAI,4676
-mergechannels-0.1.2.dist-info/WHEEL,sha256=oHq2myGwhjJ6JrE1Jw2TjjLc2CT3Tv2ynezcCNAu8so,129
-mergechannels-0.1.2.dist-info/licenses/LICENSE,sha256=csvD60rgtSorbYEM3f8867qNyPCzmIXyFNj8h01Bd6c,1071
-mergechannels/_luts.py,sha256=DxwCMBnAAJc1ZX-D4cq8HabW-sLuBQpUqOWMWXqt_84,1035
-mergechannels/_internal.py,sha256=Abzeacre5CQOcWn9WDIVuxFdEjTLIudEWQn8EsiH3oE,1243
-mergechannels/__init__.pyi,sha256=lSMX8eip_zkzoJPJKvxvAhOsewwagoAhS9H5gXJ2Da8,711
-mergechannels/__init__.py,sha256=jy8Qd3TOQ0mm-K64snjOqjdDQiSJ3gWjOjGZrliYy6k,222
-mergechannels/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mergechannels/_blending.py,sha256=mE5Cr9wvVJRcwfymg_UUZUjdIKx2mldfLU8QJT95bVM,84
-mergechannels/mergechannels.cpython-39-powerpc64le-linux-gnu.so,sha256=BxmSZAxNEXb9drcthkG8kDYOyOZULxBdCXjP-yjMaOA,1024896
-mergechannels-0.1.2.dist-info/RECORD,,