Update pictureDeal2.py

pictureDeal2.py

@@ -5,22 +5,21 @@ import numpy as np
 
 with gr.Blocks() as interface:
 
-    with gr.Accordion("请选择一张图片"):
-        # gr.Markdown("Look at me...")
-        with gr.Row():
-            img_input = gr.Image(label='请选择一张待加工图片',interactive=True)
-            img_param_output1 = gr.Image(label='勾边合成结果',interactive=False,tool='canvas')
-
-    with gr.Accordion("每次调整参数后，点击【加工图片】按钮，得到图片的勾边"):
-        with gr.Row():
-            enhance = gr.Slider(0, 1, 0.8, step=0.1, label="图片彩色度")
-            # blend = gr.Slider(0, 1, 0.4, step=0.1, label="颜色填充度")
+    with gr.Row():
+        with gr.Accordion("1.请选择一张待加工图片"):
+            img_input = gr.Image(label='图片',interactive=True)
+        with gr.Accordion("2.可更换勾边颜色，点加工图片"):
+            gr.Markdown("网页版效果更好：https://idalee-draweasy.hf.space")
             color = gr.ColorPicker(label="勾边颜色")
+            section_btn = gr.Button("加工图片")
+        # img_param_output1 = gr.Image(label='勾边合成结果',interactive=False,tool='canvas')
 
-        
-        section_btn = gr.Button("加工图片")
+    # with gr.Accordion("每次调整参数后，点击【加工图片】按钮，得到图片的勾边"):
+        # with gr.Row():
+            # enhance = gr.Slider(0, 1, 0.8, step=0.1, label="图片彩色度")
+            # blend = gr.Slider(0, 1, 0.4, step=0.1, label="颜色填充度")
     
-    with gr.Accordion("提供4种勾边效果，均可下载本地"):
+    with gr.Accordion("【结果】4种勾边效果"):
         with gr.Row():
             closed_output0 = gr.Image(label='简单勾边')
             closed_output1 = gr.Image(label='常规勾边')
@@ -39,7 +38,7 @@ with gr.Blocks() as interface:
         
 
     # 调整模型结果参数
-    def turn_arguments(img,enhance,color):
+    def turn_arguments(img,color):
     # def turn_arguments(img,enhance,blend,color):
         imageX = Image.fromarray(img)
         contrast = ImageEnhance.Contrast(imageX)
@@ -79,7 +78,7 @@ with gr.Blocks() as interface:
         image0 = Image.fromarray(img)
         enhancer0 = ImageEnhance.Color(image=image0)
         # 增强颜色  
-        img0 = enhancer0.enhance(enhance).convert('RGB')
+        # img0 = enhancer0.enhance(enhance).convert('RGB')
         # union_img0 = np.asarray(Image.blend(close00, img0, blend))
 
 
@@ -113,8 +112,8 @@ with gr.Blocks() as interface:
         image1 = Image.fromarray(img)
         enhancer1 = ImageEnhance.Color(image=image1)
         # 增强颜色  
-        img1 = enhancer1.enhance(enhance).convert('RGB')
-        union_img1 = np.asarray(Image.blend(close01, img1, blend))
+        # img1 = enhancer1.enhance(enhance).convert('RGB')
+        # union_img1 = np.asarray(Image.blend(close01, img1, blend))
 
         #####################################
         #   复杂勾边-自选颜色                #
@@ -146,7 +145,7 @@ with gr.Blocks() as interface:
         image2 = Image.fromarray(img)
         enhancer2 = ImageEnhance.Color(image=image2)
         # 增强颜色  
-        img2 = enhancer2.enhance(enhance).convert('RGB')
+        # img2 = enhancer2.enhance(enhance).convert('RGB')
         # union_img2 = np.asarray(Image.blend(close02, img2, blend))
 
         #####################################
@@ -157,18 +156,18 @@ with gr.Blocks() as interface:
         result3[closed3==0] = (255,255,255)
         close03 = Image.fromarray(result3).convert('RGB')
 
-        # 颜色空间转换
+        # 颜色空间转换  
         image3 = Image.fromarray(img)
         enhancer3 = ImageEnhance.Color(image=image3)
         # 增强颜色  
-        img3 = enhancer3.enhance(enhance).convert('RGB')
+        # img3 = enhancer3.enhance(enhance).convert('RGB')
         # union_img3 = np.asarray(Image.blend(close03, img3, blend))
 
         # return result0,union_img0,result1,union_img1,result2,union_img2,result3,union_img3
-        return result0,result1,result2,result3,union_img1
+        return result0,result1,result2,result3
     
-    section_btn.click(turn_arguments,inputs=[img_input,enhance,color],
-                      outputs = [closed_output0,closed_output1,closed_output2,closed_output3,img_param_output1])
+    section_btn.click(turn_arguments,inputs=[img_input,color],
+                      outputs = [closed_output0,closed_output1,closed_output2,closed_output3])
                                     # outputs = [closed_output0,img_param_output0,closed_output1,img_param_output1,closed_output2,img_param_output2,closed_output3,img_param_output3])
 
 interface.launch(show_api=False)