From 0d02cafe8e1cc32da1ba69cbcb5569bcc9987279 Mon Sep 17 00:00:00 2001 From: Laurent Guerard Date: Thu, 27 Mar 2025 15:19:09 +0100 Subject: [PATCH 1/2] Move `pad_number()` to `strtools` --- src/imcflibs/imagej/misc.py | 25 ------------------------- src/imcflibs/strtools.py | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/imcflibs/imagej/misc.py b/src/imcflibs/imagej/misc.py index 7b9d2630..346e1f9f 100644 --- a/src/imcflibs/imagej/misc.py +++ b/src/imcflibs/imagej/misc.py @@ -627,31 +627,6 @@ def save_image_in_format(imp, format, out_dir, series, pad_number, split_channel current_imp.close() -def pad_number(index, pad_length=2): - """Pad a number with leading zeros to a specified length. - - Parameters - ---------- - index : int or str - The number to be padded - pad_length : int, optional - The total length of the resulting string after padding, by default 2 - - Returns - ------- - str - The padded number as a string - - Examples - -------- - >>> pad_number(7) - '07' - >>> pad_number(42, 4) - '0042' - """ - return str(index).zfill(pad_length) - - def locate_latest_imaris(paths_to_check=None): """Find paths to latest installed Imaris or ImarisFileConverter version. diff --git a/src/imcflibs/strtools.py b/src/imcflibs/strtools.py index 10e731a6..d522c460 100644 --- a/src/imcflibs/strtools.py +++ b/src/imcflibs/strtools.py @@ -150,3 +150,28 @@ def alphanum_key(key): return [convert(c) for c in re.split("([0-9]+)", key)] return sorted(data, key=alphanum_key) + + +def pad_number(index, pad_length=2): + """Pad a number with leading zeros to a specified length. + + Parameters + ---------- + index : int or str + The number to be padded + pad_length : int, optional + The total length of the resulting string after padding, by default 2 + + Returns + ------- + str + The padded number as a string + + Examples + -------- + >>> pad_number(7) + '07' + >>> pad_number(42, 4) + '0042' + """ + return str(index).zfill(pad_length) From 5e8d99d165b63f10ef47cc0c2411b7ff13ae3d66 Mon Sep 17 00:00:00 2001 From: Laurent Guerard Date: Thu, 27 Mar 2025 15:19:24 +0100 Subject: [PATCH 2/2] Format using Ruff --- src/imcflibs/imagej/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imcflibs/imagej/misc.py b/src/imcflibs/imagej/misc.py index 346e1f9f..5496e7e3 100644 --- a/src/imcflibs/imagej/misc.py +++ b/src/imcflibs/imagej/misc.py @@ -123,7 +123,7 @@ def calculate_mean_and_stdv(values_list, round_decimals=0): mean = round(sum(filtered_list) / len(filtered_list), round_decimals) variance = sum((x - mean) ** 2 for x in filtered_list) / len(filtered_list) - std_dev = round(variance ** 0.5, round_decimals) + std_dev = round(variance**0.5, round_decimals) return mean, std_dev