mergechannels 0.2.0__cp312-cp312-musllinux_1_2_aarch64.whl → 0.4.0__cp312-cp312-musllinux_1_2_aarch64.whl

mergechannels/__init__.py

@@ -3,11 +3,12 @@ from .mergechannels import (  # type: ignore
 	dispatch_single_channel,
 	dispatch_multi_channel,
 )
-from ._internal import merge
+from ._internal import merge, apply_color_map
 
 
 __all__ = [
 	'dispatch_single_channel',
 	'dispatch_multi_channel',
 	'merge',
+	'apply_color_map',
 ]

mergechannels/__init__.pyi

@@ -6,11 +6,20 @@ from python.mergechannels._blending import BLENDING_OPTIONS
 from python.mergechannels._luts import COLORMAPS
 
 
+def apply_color_map(
+	arr: np.ndarray,
+	color: COLORMAPS,
+	percentiles: tuple[float, float] | None = None,
+	saturation_limits: tuple[float, float] | None = None,
+) -> np.ndarray:
+    ...
+
 def merge(
-    arrs: np.ndarray | Sequence[np.ndarray],
-    colors: Sequence[COLORMAPS] = (),
-    blending: Literal[BLENDING_OPTIONS] = 'max',
-    saturation_limits: tuple[float, float] = (0.2, 99.8),
+	arrs: Sequence[np.ndarray],
+	colors: Sequence[COLORMAPS],
+	blending: BLENDING_OPTIONS = 'max',
+	percentiles: tuple[float, float] | Sequence[tuple[float, float]] | None = None,
+	saturation_limits: tuple[float, float] | Sequence[tuple[float, float]] | None = None,
 ) -> np.ndarray:
     ...
 

mergechannels/_internal.py

@@ -1,4 +1,7 @@
-from typing import Sequence
+from typing import (
+	Sequence,
+	Union,
+)
 
 import numpy as np
 
@@ -9,57 +12,48 @@ from mergechannels import (
 from ._luts import COLORMAPS
 from ._blending import BLENDING_OPTIONS
 
+def apply_color_map(
+	arr: np.ndarray,
+	color: COLORMAPS,
+	percentiles: Union[tuple[float, float], None] = None,
+	saturation_limits: Union[tuple[float, float], None] = None,
+) -> np.ndarray:
+	'''
+	apply a color map to an array
+	'''
+	if saturation_limits is None:
+		if percentiles is None:
+			percentiles = (1.1, 99.9)
+		low, high = np.percentile(arr, percentiles)
+		saturation_limits = (low, high)
+
+	return dispatch_single_channel(
+		array_reference=arr,
+		cmap_name=color,
+		limits=saturation_limits,
+	)
+
+
 def merge(
 	arrs: Sequence[np.ndarray],
 	colors: Sequence[COLORMAPS],
 	blending: BLENDING_OPTIONS = 'max',
-    saturation_limits: tuple[float, float] = (0.011, 0.999),
+	percentiles: Union[Sequence[tuple[float, float]], None] = None,
+	saturation_limits: Union[Sequence[tuple[float, float]], None] = None,
 ) -> np.ndarray:
 	'''
 	apply cmaps to arrays and blend the colors
 	'''
-	# region validation
-	n_arrs = len(arrs)
-	n_colors = len(colors)
-	if not n_arrs == n_colors and n_arrs > 0:
-		raise ValueError(
-			'Expected an equal number of arrays to colorize and colormap names to apply. '
-			f'Got {n_arrs} arrays and {n_colors} colors'
-		)
-	arr_shapes = [arr.shape for arr in arrs]
-	if not len(set(arr_shapes)) == 1:
-		raise ValueError(
-			f'Expected every array to have the same shape, got {arr_shapes}'
-		)
-	if len(arr_shapes[0]) not in (2, 3):
-		raise ValueError(
-			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:
-		raise ValueError(
-			f'Expected every array to have the same dtype, got {arr_dtypes}'
-		)
-	# endregion
-	if n_arrs == 1:
-		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:
-		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
+	if saturation_limits is None:
+		if percentiles is None:
+			percentiles = [(1.1, 99.9)] * len(arrs)
+		saturation_limits = tuple(
+			np.percentile(arr, ch_percentiles)
+			for arr, ch_percentiles in zip(arrs, percentiles)  # type: ignore
 		)
+	return dispatch_multi_channel(
+		array_references=arrs,
+		cmap_names=colors,
+		blending=blending,
+		limits=saturation_limits,  # type: ignore
+	)

mergechannels/_luts.py

@@ -1,81 +1,177 @@
 from typing import Literal
 
 COLORMAPS = Literal[
+	'Circus Ink Purple',
+	'Spectrum Parabolic Ramp',
+	'Pop cherry',
+	'Circus Green',
 	'Rainbow RGB',
+	'Parabolic RGB',
 	'3color-RMB',
+	'Pop magenta inverted',
 	'Red Hot',
+	'Duo Cyan',
 	'Yellow',
+	'Grays g=0.25 inverted',
 	'betterRed',
+	'Grays g=1.75',
 	'blue_orange_icb',
+	'Pop green',
 	'mpl-inferno',
 	'I Blue',
 	'BOP purple',
+	'Duo Yellow',
+	'Phase Ink Mint-Cherry',
 	'betterOrange',
 	'Blue',
 	'6_shades',
+	'Ink Cyan',
 	'OIMB3',
+	'Quartetto MYGB Blue',
+	'Ink Green',
 	'Red/Green',
 	'Turbo',
+	'Circus Ink Black',
+	'Duo Green',
 	'mpl-viridis',
+	'Grays g=0.25',
+	'Quartetto RYGB Blue',
 	'smart',
 	'Thermal',
 	'OIMB2',
+	'Pop blue inverted',
+	'Duo Intense Cherry',
+	'Phase Bold Green-Magenta',
+	'Quartetto MYGB Magenta',
+	'Pop purple inverted',
 	'glow',
 	'OPF orange',
+	'Pop cyan inverted',
 	'physics',
+	'Phase Ink Yellow-Cyan',
+	'Circus Ink Mint',
+	'Ink Wash Purple',
 	'OIMB1',
 	'betterCyan',
 	'mpl-magma',
+	'Duo Intense Green',
 	'edges',
+	'Quartetto MYGB Green',
+	'Ink Wash Cherry',
 	'OPF purple',
+	'Ink Wash Cyan',
+	'Duo Intense Purple',
 	'I Yellow',
 	'16_colors',
+	'Circus Cyan',
+	'Pop lavender inverted',
 	'sepia',
+	'Duo Intense Cyan',
+	'Grays g=1.00 inverted',
 	'ICA2',
+	'Quartetto RYGB Green',
+	'Ink Wash Green',
+	'Pop blue',
+	'Quartetto RYGB Red',
 	'I Forest',
 	'ICA3',
+	'Circus Yellow',
+	'Pop mint',
 	'BOP orange',
+	'Grays g=1.25 inverted',
 	'I Red',
 	'3color-CGY',
 	'I Green',
 	'Fire',
 	'Magenta Hot',
+	'Grays g=0.50',
 	'Orange Hot',
+	'Circus Ink Cherry',
+	'Pop purple',
+	'Ink Yellow',
 	'unionjack',
+	'Ink Wash Yellow',
 	'I Cyan',
 	'Cyan Hot',
+	'Pop mint inverted',
 	'I Magenta',
 	'Grays',
+	'Phase Green-Magenta',
 	'Cyan',
+	'Grays g=0.75',
+	'Phase Bold Ink Mint-Cherry',
+	'Grays g=1.75 inverted',
 	'phase',
 	'gem',
+	'Pop cherry inverted',
+	'Pop red',
+	'Circus Cherry',
 	'OPF fresh',
+	'Circus Ink Cyan',
 	'betterGreen',
+	'Phase Ink Green-Magenta',
 	'3color-BMR',
+	'Ink Wash Black',
+	'Pop red inverted',
+	'Duo Purple',
 	'betterBlue',
+	'Phase Bold Ink Yellow-Cyan',
+	'Quartetto RYGB Yellow',
 	'Magenta',
+	'Duo Mint',
 	'Red',
+	'Grays g=1.25',
 	'I Bordeaux',
+	'Grays g=1.50 inverted',
+	'Green Hot',
 	'glasbey',
 	'glasbey_on_dark',
 	'mpl-plasma',
+	'Ink Cherry',
+	'Ink Mint',
+	'Circus Ink Yellow',
+	'Pop cyan',
+	'Pop green inverted',
+	'Ink Purple',
 	'3color-YGC',
+	'Pop yellow',
+	'Quartetto MYGB Yellow',
+	'Duo Cherry',
 	'Green',
+	'Grays g=0.50 inverted',
+	'Circus Ink Green',
 	'ICA',
+	'Phase Mint-Cherry',
+	'Ink Black',
 	'Yellow Hot',
+	'Phase Bold Yellow-Cyan',
 	'thallium',
+	'Pop yellow inverted',
 	'Spectrum',
 	'royal',
 	'glasbey_inverted',
 	'betterYellow',
+	'Circus Purple',
+	'Grays g=2.00',
 	'HiLo',
 	'cool',
 	'Green Fire Blue',
+	'Ink Wash Mint',
+	'Grays g=0.75 inverted',
 	'BOP blue',
 	'thal',
 	'Ice',
+	'Circus Mint',
+	'Grays g=1.50',
+	'Duo Intense Mint',
 	'brgbcmyw',
+	'Phase Yellow-Cyan',
 	'I Purple',
+	'Duo Intense Yellow',
+	'Phase Bold Ink Green-Magenta',
+	'Pop magenta',
 	'3-3-2 RGB',
+	'Grays g=2.00 inverted',
 	'5_ramps',
+	'Phase Bold Mint-Cherry',
 ]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mergechannels
-Version: 0.2.0
+Version: 0.4.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -50,6 +50,7 @@ pip install git+https://github.com/zacswider/mergechannels.git
 
 ```python
 from skimage import data
+import matplotlib.pyplot as plt
 import mergechannels as mc
 
 img = data.camera()
@@ -116,10 +117,10 @@ b.imshow(
         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
-        ),
+        percentiles=[(
+            1,  # bottom 1% of pixels set to black point
+            97,  # top 3% of pixels set to white point
+        )]*len(channels),
     ),
 )
 fig.tight_layout()

mergechannels-0.4.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+mergechannels-0.4.0.dist-info/METADATA,sha256=UFSUXd5ow06vtucS9sA9wum226fAXxzK8oQignieJtY,5762
+mergechannels-0.4.0.dist-info/WHEEL,sha256=TE1mZA2wMYutqqvZXGIxT5tBliKoOBY2cbiY193djpA,108
+mergechannels-0.4.0.dist-info/licenses/LICENSE,sha256=csvD60rgtSorbYEM3f8867qNyPCzmIXyFNj8h01Bd6c,1071
+mergechannels.libs/libgcc_s-e52197c3.so.1,sha256=vkPW1Auw6CH9Bjk7frmX3hry_1H9c0tRI0Ncyg71WUI,724137
+mergechannels/__init__.py,sha256=87haN6eeG02qnJJerNCb4Tfn-3GpChD89DKsFAYIH3Y,269
+mergechannels/__init__.pyi,sha256=FZYQH4ue5M9r3zeUMHVZoU2D_RYwd3UiVD-GkcReY7M,1011
+mergechannels/_blending.py,sha256=mE5Cr9wvVJRcwfymg_UUZUjdIKx2mldfLU8QJT95bVM,84
+mergechannels/_internal.py,sha256=tMQtEG3s-N8eamqLUPUHy_fTO-7FqR8Q0Xng-4RSAC0,1421
+mergechannels/_luts.py,sha256=RswhkrCGAFtDthmVHt-Kk7lxROwS-kdsQy1EboyUUc8,3009
+mergechannels/mergechannels.cpython-312-aarch64-linux-musl.so,sha256=zLEAKYYOwzeGrAbvgmy-3OG-lhdviRpXQ185r98Yl8w,1116985
+mergechannels/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mergechannels-0.4.0.dist-info/RECORD,,

mergechannels-0.2.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-mergechannels-0.2.0.dist-info/METADATA,sha256=t-okrnqyvIiZxuLqTlubmCkXCxKz9U43u7bhSIEiNBc,5725
-mergechannels-0.2.0.dist-info/WHEEL,sha256=TE1mZA2wMYutqqvZXGIxT5tBliKoOBY2cbiY193djpA,108
-mergechannels-0.2.0.dist-info/licenses/LICENSE,sha256=csvD60rgtSorbYEM3f8867qNyPCzmIXyFNj8h01Bd6c,1071
-mergechannels.libs/libgcc_s-e52197c3.so.1,sha256=vkPW1Auw6CH9Bjk7frmX3hry_1H9c0tRI0Ncyg71WUI,724137
-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-312-aarch64-linux-musl.so,sha256=wco5PuwyHu87E6dIQzdYV-v7ZPCYfoB3WN_FoVuRx7Q,985913
-mergechannels/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mergechannels-0.2.0.dist-info/RECORD,,