change to new version

.gitattributes

@@ -33,3 +33,4 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
 *tfevents* filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text

README.md

@@ -4,7 +4,7 @@ emoji: 💻
 colorFrom: gray
 colorTo: green
 sdk: gradio
-sdk_version: 4.40.0
+sdk_version: 5.34.2
 app_file: app.py
 pinned: false
 license: mit

app.py

@@ -1,7 +1,73 @@
+import glob
 import gradio as gr
 from PIL import Image
 import cv2
 import numpy as np
+import pandas as pd
+from collections import Counter
+
+def check_pixel_value(img_pil_rgba: Image.Image, evt: gr.SelectData):
+    pointX, pointY = evt.index
+
+    pixel_pil_rgba = np.array(img_pil_rgba)[pointY, pointX]
+    pixel_pil_hsv = np.array(img_pil_rgba.convert('HSV'))[pointY, pointX]
+    pixel_pil_grayscale = np.array(img_pil_rgba.convert('L'))[pointY, pointX]
+
+    img_cv_rgba = np.array(img_pil_rgba)
+    img_cv_bgra = cv2.cvtColor(img_cv_rgba, cv2.COLOR_RGBA2BGRA)
+    pixel_cv_bgra = img_cv_bgra[pointY, pointX]
+    pixel_cv_rgba = cv2.cvtColor(img_cv_bgra, cv2.COLOR_BGRA2RGBA)[pointY, pointX]
+    pixel_cv_hsv = cv2.cvtColor(img_cv_bgra, cv2.COLOR_BGR2HSV)[pointY, pointX]
+    pixel_cv_hsv_full = cv2.cvtColor(img_cv_bgra, cv2.COLOR_BGR2HSV_FULL)[pointY, pointX]
+    pixel_cv_lab = cv2.cvtColor(img_cv_bgra, cv2.COLOR_BGR2Lab)[pointY, pointX]
+    pixel_cv_grayscale = cv2.cvtColor(img_cv_bgra, cv2.COLOR_BGRA2GRAY)[pointY, pointX]
+
+    pixels = [pixel_pil_rgba, pixel_pil_hsv, pixel_pil_grayscale, pixel_cv_bgra, pixel_cv_rgba, pixel_cv_hsv, pixel_cv_hsv_full, pixel_cv_lab, pixel_cv_grayscale]
+    for i, pixel in enumerate(pixels):
+        if isinstance(pixel, np.ndarray) :
+            pixels[i] = tuple(map(int, pixel))
+    return pixels
+
+def check_pixel_distribution(img_pil_rgba, mask_pil=None):
+    if mask_pil is None:
+        rgba_array = np.array(img_pil_rgba.convert('RGBA'))
+        r_pixels, g_pixels, b_pixels, a_pixels = rgba_array[:,:,0], rgba_array[:,:,1], rgba_array[:,:,2], rgba_array[:,:,3]
+    else:
+        mask_bool = np.where(np.array(mask_pil.convert('L')) > 128, True, False)
+        rgba_array = np.array(img_pil_rgba.convert('RGBA'))[mask_bool]
+        r_pixels, g_pixels, b_pixels, a_pixels = rgba_array[:,0], rgba_array[:,1], rgba_array[:,2], rgba_array[:,3]
+    
+    r_counter = Counter(r_pixels.flatten().tolist())
+    g_counter = Counter(g_pixels.flatten().tolist())
+    b_counter = Counter(b_pixels.flatten().tolist())
+    a_counter = Counter(a_pixels.flatten().tolist())
+
+    img_pil_hsv = img_pil_rgba.convert('HSV')
+    hsv_array = np.array(img_pil_hsv)
+    h_pixels, s_pixels, v_pixels = hsv_array[:,:,0], hsv_array[:,:,1], hsv_array[:,:,2]
+    h_counter = Counter(h_pixels.flatten().tolist())
+    s_counter = Counter(s_pixels.flatten().tolist())
+    v_counter = Counter(v_pixels.flatten().tolist())
+
+    dict = {
+        'value': list(range(256)),
+        'R_count': [r_counter.get(i, 0) for i in range(256)],
+        'G_count': [g_counter.get(i, 0) for i in range(256)],
+        'B_count': [b_counter.get(i, 0) for i in range(256)],
+        'A_count': [a_counter.get(i, 0) for i in range(256)],
+        'H_count': [h_counter.get(i, 0) for i in range(256)],
+        'S_count': [s_counter.get(i, 0) for i in range(256)],
+        'V_count': [v_counter.get(i, 0) for i in range(256)]
+    }
+    df = pd.DataFrame(dict)
+    return [df] * 7
+
+def extract_from_editor(input_img, editor) :
+    cut_img_array = np.array(input_img.convert('RGBA'))
+    mask = editor['layers'][0].split()[3]
+    mask_bool = np.where(np.array(mask.convert('L')) > 128, True, False)
+    cut_img_array[~mask_bool] = (128, 128, 128, 255)
+    return Image.fromarray(cut_img_array), mask
 
 js_func = """
 function refresh() {
@@ -13,52 +79,75 @@ function refresh() {
     }
 }
 """
+with gr.Blocks(js=js_func) as demo :
 
-def print_pixel(pixel) :
-    if isinstance(pixel, np.ndarray) :
-        return tuple(map(int, pixel))
-    else :
-        return pixel
+    with gr.Tab("Check Pixel-Value") :
+        with gr.Row() :
+            with gr.Column(scale=3):
+                input_img = gr.Image(sources=['upload'], type='pil', image_mode='RGBA', scale=3, show_label=False)
+                gr.Examples(examples=sorted(glob.glob('samples/*')), inputs=input_img)
 
-with gr.Blocks(js=js_func) as demo:
+            with gr.Column(scale=1):
+                pil_rgb = gr.Textbox(label='PIL RGBA', interactive=False)
+                pil_hsv = gr.Textbox(label='PIL HSV', interactive=False)
+                pil_grayscale = gr.Textbox(label='PIL Grayscale', interactive=False)
+            
+            with gr.Column(scale=1):
+                cv_rgba = gr.Textbox(label='OpenCV RGBA', interactive=False)
+                cv_bgra = gr.Textbox(label='OpenCV BGRA', interactive=False)
+                cv_hsv = gr.Textbox(label='OpenCV HSV', interactive=False)
+                cv_hsv_full = gr.Textbox(label='OpenCV HSV_FULL', interactive=False)
+                cv_lab = gr.Textbox(label='OpenCV Lab', interactive=False)
+                cv_grayscale = gr.Textbox(label='OpenCV Grayscale', interactive=False)
 
-    with gr.Row():
-        color_map = gr.Image(value='color_map.png', scale=3, type='pil',
-                             interactive=False, show_label=False, show_download_button=False, show_share_button=False)
+        input_img.select(check_pixel_value, inputs=[input_img], outputs=[pil_rgb, pil_hsv, pil_grayscale, cv_bgra, cv_rgba, cv_hsv, cv_hsv_full, cv_lab, cv_grayscale])
 
-        with gr.Column(scale=1):
-            pil_rgb = gr.Textbox(label='PIL RGB', interactive=False)
-            pil_hsv = gr.Textbox(label='PIL HSV', interactive=False)
-            pil_grayscale = gr.Textbox(label='PIL Grayscale', interactive=False)
-        
-        with gr.Column(scale=1):
-            opencv_rgb = gr.Textbox(label='OpenCV RGB', interactive=False)
-            opencv_bgr = gr.Textbox(label='OpenCV BGR', interactive=False)
-            opencv_hsv = gr.Textbox(label='OpenCV HSV', interactive=False)
-            opencv_hsv_full = gr.Textbox(label='OpenCV HSV_FULL', interactive=False)
-            opencv_lab = gr.Textbox(label='OpenCV Lab', interactive=False)
-            opencv_grayscale = gr.Textbox(label='OpenCV Grayscale', interactive=False)
-
-    def get_select_coords(pil_img: Image, evt: gr.SelectData):
-        pointX, pointY = evt.index
-
-        pil_rgb = np.array(pil_img.convert('RGB'))[pointY, pointX]
-        pil_hsv = np.array(pil_img.convert('HSV'))[pointY, pointX]
-        pil_grayscale = np.array(pil_img.convert('L'))[pointY, pointX]
-
-        img_rgb = np.array(pil_img.convert('RGB'))
-        img_bgr = cv2.cvtColor(img_rgb, cv2.COLOR_RGB2BGR)
-
-        opencv_bgr = img_bgr[pointY, pointX]
-        opencv_rgb = cv2.cvtColor(img_bgr, cv2.COLOR_BGR2RGB)[pointY, pointX]
-        opencv_hsv = cv2.cvtColor(img_bgr, cv2.COLOR_BGR2HSV)[pointY, pointX]
-        opencv_hsv_full = cv2.cvtColor(img_bgr, cv2.COLOR_BGR2HSV_FULL)[pointY, pointX]
-        opencv_lab = cv2.cvtColor(img_bgr, cv2.COLOR_BGR2Lab)[pointY, pointX]
-        opencv_grayscale = cv2.cvtColor(img_bgr, cv2.COLOR_BGR2GRAY)[pointY, pointX]
-
-        pixels = [pil_rgb, pil_hsv, pil_grayscale, opencv_bgr, opencv_rgb, opencv_hsv, opencv_hsv_full, opencv_lab, opencv_grayscale]
-        return [print_pixel(pixel) for pixel in pixels]
+
+    with gr.Tab("Check Pixel-Distribution") :
+        with gr.Row():
+            with gr.Column(scale=1):
+                input_img = gr.Image(sources=['upload'], type='pil', image_mode='RGBA', scale=3, show_label=False)
+                gr.Examples(examples=sorted(glob.glob('samples/*')), inputs=input_img)
+
+            with gr.Column(scale=3):
+                with gr.Row():
+                    r_barplot = gr.BarPlot(x='value', y='R_count', x_lim=[0, 255], x_bin=16)
+                    g_barplot = gr.BarPlot(x='value', y='G_count', x_lim=[0, 255], x_bin=16)
+                    b_barplot = gr.BarPlot(x='value', y='B_count', x_lim=[0, 255], x_bin=16)
+                    a_barplot = gr.BarPlot(x='value', y='A_count', x_lim=[0, 255], x_bin=16)
+                with gr.Row():
+                    h_barplot = gr.BarPlot(x='value', y='H_count', x_lim=[0, 255], x_bin=16)
+                    s_barplot = gr.BarPlot(x='value', y='S_count', x_lim=[0, 255], x_bin=16)
+                    v_barplot = gr.BarPlot(x='value', y='V_count', x_lim=[0, 255], x_bin=16)
+
+        input_img.change(fn=check_pixel_distribution, inputs=[input_img], outputs=[r_barplot, g_barplot, b_barplot, a_barplot, h_barplot, s_barplot, v_barplot])
+
+
+    with gr.Tab("Check Pixel-Distribution by Mask") :
+        gr.Markdown("gr.ImageEditor에서 알파 채널이 무시되는 이슈가 있기 때문에, gr.Image를 통해 이미지를 업로드합니다.")
+        with gr.Row() :
+            with gr.Column(scale=1):
+                input_img = gr.Image(sources=['upload'], type='pil', image_mode='RGBA', show_label=False)
+                input_editor = gr.ImageEditor(sources=['upload'], type='pil', image_mode='RGBA', layers=False, show_label=False, interactive=True)
+                
+                btn = gr.Button('Check', variant='primary')
+                cut_img = gr.Image(type='pil', image_mode='RGBA', show_label=False, show_download_button=False, show_share_button=False, interactive=False)
+                mask_img = gr.Image(type='pil', image_mode='L', show_label=False, show_download_button=False, show_share_button=False, interactive=False)
+                gr.Examples(examples=sorted(glob.glob('samples/*')), inputs=input_img)
+
+                input_img.change(fn=lambda x:x, inputs=[input_img], outputs=[input_editor])
+
+            with gr.Column(scale=2):
+                with gr.Row():
+                    r_barplot = gr.BarPlot(x='value', y='R_count', x_lim=[0, 255], x_bin=16)
+                    g_barplot = gr.BarPlot(x='value', y='G_count', x_lim=[0, 255], x_bin=16)
+                    b_barplot = gr.BarPlot(x='value', y='B_count', x_lim=[0, 255], x_bin=16)
+                    a_barplot = gr.BarPlot(x='value', y='A_count', x_lim=[0, 255], x_bin=16)
+                with gr.Row():
+                    h_barplot = gr.BarPlot(x='value', y='H_count', x_lim=[0, 255], x_bin=16)
+                    s_barplot = gr.BarPlot(x='value', y='S_count', x_lim=[0, 255], x_bin=16)
+                    v_barplot = gr.BarPlot(x='value', y='V_count', x_lim=[0, 255], x_bin=16)
         
-    color_map.select(get_select_coords, inputs=[color_map], outputs=[pil_rgb, pil_hsv, pil_grayscale, opencv_bgr, opencv_rgb, opencv_hsv, opencv_hsv_full, opencv_lab, opencv_grayscale])
+        btn.click(fn=extract_from_editor, inputs=[input_img, input_editor], outputs=[cut_img, mask_img]).success(fn=check_pixel_distribution, inputs=[input_img, mask_img], outputs=[r_barplot, g_barplot, b_barplot, a_barplot, h_barplot, s_barplot, v_barplot])
 
 demo.launch()

requirements.txt

@@ -1,2 +1,3 @@
-pillow==10.4.0
-opencv-python-headless==4.10.0.84
+pillow==11.3.0
+opencv-python-headless==4.12.0.88
+matplotlib==3.10.3