From 642d53fb429b6cca2f0711ec10698650fb547fb5 Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Fri, 10 Nov 2023 12:10:20 -0500 Subject: [PATCH] All comparison updates --- py/common.py | 7 +++++++ py/comparison_comparison.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/py/common.py b/py/common.py index db689a6..f79ecc4 100644 --- a/py/common.py +++ b/py/common.py @@ -141,6 +141,13 @@ def weighted_euclidean_distance (r1, g1, b1, r2, g2, b2) : #print(type(r1)) return sqrt( ((r2-r1) * R)**2 + ((g2-g1) * G)**2 + ((b2-b1) * B)**2 ) +def to_luma (color, space) : + color = [float(i) for i in list(color)] + if space == 'RGB' : + return rgb_to_luma(color[0], color[1], color[2]) + elif space == 'BGR' : + return rgb_to_luma(color[2], color[1], color[0]) + def rgb_to_luma (r, g, b) : R = 0.2126 G = 0.7152 diff --git a/py/comparison_comparison.py b/py/comparison_comparison.py index 1871d4b..f9faa49 100644 --- a/py/comparison_comparison.py +++ b/py/comparison_comparison.py @@ -59,7 +59,7 @@ class ComparisonComparison: else : closest, dist = closest_color_euclidean(colors, cccompare) - colors = remove_from_list(colors, closest) + colors = remove_from_list(colors, c losest) ccbgr = convert_color(cc, 'RGB', 'BGR') chosenbgr = convert_color(closest, space, 'BGR')