Adjust the layout

app.py

@@ -256,20 +256,21 @@ if __name__ == "__main__":
                                                     show_label=True,
                                                     )
                         with gr.Row().style(mobile_collapse=False, equal_height=True):
-                            sample_size = gr.Slider(minimum=1,
-                                                    maximum=4,
-                                                    step=1,
-                                                    label="生成数量(number)",
-                                                    show_label=True,
-                                                    interactive=True,
-                                                    )
+                            # sample_size = gr.Slider(minimum=1,
+                            #                         maximum=4,
+                            #                         step=1,
+                            #                         label="生成数量(number)",
+                            #                         show_label=True,
+                            #                         interactive=True,
+                            #                         )
+                            sample_size = gr.Radio(choices=["1","2","3","4"], value="1", show_label=True, )
                         with gr.Row(visible=False).style(mobile_collapse=False, equal_height=True):
                             sr_option = gr.Checkbox(value=False, label="是否使用超分(Whether to use super-resolution)")
 
                     gallery = gr.Gallery(
                         label="Generated images", show_label=False, elem_id="gallery"
                     ).style(grid=[2,2])
-
+                    gr.Examples(examples=examples, fn=request_images, inputs=text, outputs=gallery, examples_per_page=100)
                     with gr.Row().style(mobile_collapse=False, equal_height=True):
                         img_choices = gr.Dropdown(["图片1(img1)"],label='请选择一张图片发送到图生图或者超分',show_label=True,value="图片1(img1)")
                     with gr.Row().style(mobile_collapse=False, equal_height=True):
@@ -284,7 +285,7 @@ if __name__ == "__main__":
 
                     sr_gallery = gr.Gallery(
                         label="SR images", show_label=True, elem_id="sr_gallery"
-                    ).style(grid=[2,2])
+                    ).style(grid=[1,1])
 
                     with gr.Row():
                         prompt = gr.Markdown("提示(Prompt)：", visible=False)
@@ -301,10 +302,8 @@ if __name__ == "__main__":
                     #             rounded=(True, True, True, True),
                     #         )
 
-
-                    gr.Examples(examples=examples, fn=request_images, inputs=text, outputs=gallery, examples_per_page=100)
-                    text.submit(request_images, inputs=[text, class_draw, style_draw, sample_size, sr_option], outputs=gallery)
-                    btn.click(request_images, inputs=[text, class_draw, style_draw, sample_size, sr_option], outputs=gallery)
+                    text.submit(request_images, inputs=[text, class_draw, style_draw, int(sample_size), sr_option], outputs=gallery)
+                    btn.click(request_images, inputs=[text, class_draw, style_draw, int(sample_size), sr_option], outputs=gallery)
                     # to do here
                     output_txt2img_sr_btn.click(sr_request_images, inputs=[gallery, img_choices], outputs=[sr_gallery])
 
@@ -328,83 +327,83 @@ if __name__ == "__main__":
                                                  elem_id="img2img_mask_btn")
                     img2img_btn_editor = gr.Button("Generate", variant="primary", elem_id="img2img_edit_btn")
                 with gr.Row().style(equal_height=False):
-                    with gr.Column():
-                        gr.Markdown('#### 输入图像')
-                        img2img_image_mask = gr.Image(
-                            value=sample_img2img,
-                            source="upload",
-                            interactive=True,
-                            tool="sketch",
-                            type='pil',
-                            elem_id="img2img_mask",
-                            image_mode="RGBA"
-                        )
-                        img2img_image_editor = gr.Image(
-                            value=sample_img2img,
-                            source="upload",
-                            interactive=True,
-                            tool="select",
-                            type='pil',
-                            visible=False,
-                            image_mode="RGBA",
-                            elem_id="img2img_editor"
-                        )
-                        with gr.Tabs(visible=True):
-                            with gr.TabItem("编辑设置"):
+                    #with gr.Column():
+                    gr.Markdown('#### 输入图像')
+                    img2img_image_mask = gr.Image(
+                        value=sample_img2img,
+                        source="upload",
+                        interactive=True,
+                        tool="sketch",
+                        type='pil',
+                        elem_id="img2img_mask",
+                        image_mode="RGBA"
+                    )
+                    img2img_image_editor = gr.Image(
+                        value=sample_img2img,
+                        source="upload",
+                        interactive=True,
+                        tool="select",
+                        type='pil',
+                        visible=False,
+                        image_mode="RGBA",
+                        elem_id="img2img_editor"
+                    )
+                    with gr.Tabs(visible=True):
+                        with gr.TabItem("编辑设置"):
+                            with gr.Row():
+                                # disable Uncrop for now
+                                choices=["Mask", "Crop", "Uncrop"]
+                                img2img_image_editor_mode = gr.Radio(choices=["Mask"],
+                                                                        label="编辑模式",
+                                                                        value="Mask", elem_id='edit_mode_select',
+                                                                        visible=True)
+                                img2img_mask = gr.Radio(choices=["保留mask区域", "生成mask区域"],
+                                                        label="Mask 方式",
+                                                        #value=img2img_mask_modes[img2img_defaults['mask_mode']],
+                                                        value = "生成mask区域",
+                                                        visible=True)
+
+                                img2img_mask_blur_strength = gr.Slider(minimum=1, maximum=10, step=1,
+                                                                        label="How much blurry should the mask be? (to avoid hard edges)",
+                                                                        value=3, visible=False)
+
+                                img2img_resize = gr.Radio(label="Resize mode",
+                                                            choices=["Just resize", "Crop and resize",
+                                                                    "Resize and fill"],
+                                                            value=img2img_resize_modes[
+                                                                img2img_defaults['resize_mode']], visible=False)
+
+                            img2img_painterro_btn = gr.Button("Advanced Editor",visible=False)
+                        # with gr.TabItem("Hints",visible=False):
+                        #     img2img_help = gr.Markdown(visible=False, value=uifn.help_text)
+
+                with gr.Row():
+                    gr.Markdown('#### 编辑后的图片')
+                    output_img2img_gallery = gr.Gallery(label="Images", elem_id="img2img_gallery_output").style(
+                        grid=[4, 4, 4])
+                    img2img_job_ui = job_manager.draw_gradio_ui() if job_manager else None
+                    with gr.Column(visible=False):
+                        with gr.Tabs(visible=False):
+                            with gr.TabItem("", id="img2img_actions_tab",visible=False):
+                                gr.Markdown("Select an image, then press one of the buttons below")
                                 with gr.Row():
-                                    # disable Uncrop for now
-                                    choices=["Mask", "Crop", "Uncrop"]
-                                    img2img_image_editor_mode = gr.Radio(choices=["Mask"],
-                                                                         label="编辑模式",
-                                                                         value="Mask", elem_id='edit_mode_select',
-                                                                         visible=True)
-                                    img2img_mask = gr.Radio(choices=["保留mask区域", "生成mask区域"],
-                                                            label="Mask 方式",
-                                                            #value=img2img_mask_modes[img2img_defaults['mask_mode']],
-                                                            value = "生成mask区域",
-                                                            visible=True)
-
-                                    img2img_mask_blur_strength = gr.Slider(minimum=1, maximum=10, step=1,
-                                                                           label="How much blurry should the mask be? (to avoid hard edges)",
-                                                                           value=3, visible=False)
-
-                                    img2img_resize = gr.Radio(label="Resize mode",
-                                                              choices=["Just resize", "Crop and resize",
-                                                                       "Resize and fill"],
-                                                              value=img2img_resize_modes[
-                                                                  img2img_defaults['resize_mode']], visible=False)
-
-                                img2img_painterro_btn = gr.Button("Advanced Editor",visible=False)
-                            # with gr.TabItem("Hints",visible=False):
-                            #     img2img_help = gr.Markdown(visible=False, value=uifn.help_text)
+                                    output_img2img_copy_to_clipboard_btn = gr.Button("Copy to clipboard")
+                                    output_img2img_copy_to_input_btn = gr.Button("Push to img2img input")
+                                    output_img2img_copy_to_mask_btn = gr.Button("Push to img2img input mask")
 
-                    with gr.Column():
-                        gr.Markdown('#### 编辑后的图片')
-                        output_img2img_gallery = gr.Gallery(label="Images", elem_id="img2img_gallery_output").style(
-                            grid=[4, 4, 4])
-                        img2img_job_ui = job_manager.draw_gradio_ui() if job_manager else None
-                        with gr.Column(visible=False):
-                            with gr.Tabs(visible=False):
-                                with gr.TabItem("", id="img2img_actions_tab",visible=False):
-                                    gr.Markdown("Select an image, then press one of the buttons below")
-                                    with gr.Row():
-                                        output_img2img_copy_to_clipboard_btn = gr.Button("Copy to clipboard")
-                                        output_img2img_copy_to_input_btn = gr.Button("Push to img2img input")
-                                        output_img2img_copy_to_mask_btn = gr.Button("Push to img2img input mask")
-
-                                    gr.Markdown("Warning: This will clear your current image and mask settings!")
-                                with gr.TabItem("", id="img2img_output_info_tab",visible=False):
-                                    output_img2img_params = gr.Textbox(label="Generation parameters")
-                                    with gr.Row():
-                                        output_img2img_copy_params = gr.Button("Copy full parameters").click(
-                                            inputs=output_img2img_params, outputs=[],
-                                            _js='(x) => {navigator.clipboard.writeText(x.replace(": ",":"))}', fn=None,
-                                            show_progress=False)
-                                        output_img2img_seed = gr.Number(label='Seed', interactive=False, visible=False)
-                                        output_img2img_copy_seed = gr.Button("Copy only seed").click(
-                                            inputs=output_img2img_seed, outputs=[],
-                                            _js=call_JS("gradioInputToClipboard"), fn=None, show_progress=False)
-                                    output_img2img_stats = gr.HTML(label='Stats')
+                                gr.Markdown("Warning: This will clear your current image and mask settings!")
+                            with gr.TabItem("", id="img2img_output_info_tab",visible=False):
+                                output_img2img_params = gr.Textbox(label="Generation parameters")
+                                with gr.Row():
+                                    output_img2img_copy_params = gr.Button("Copy full parameters").click(
+                                        inputs=output_img2img_params, outputs=[],
+                                        _js='(x) => {navigator.clipboard.writeText(x.replace(": ",":"))}', fn=None,
+                                        show_progress=False)
+                                    output_img2img_seed = gr.Number(label='Seed', interactive=False, visible=False)
+                                    output_img2img_copy_seed = gr.Button("Copy only seed").click(
+                                        inputs=output_img2img_seed, outputs=[],
+                                        _js=call_JS("gradioInputToClipboard"), fn=None, show_progress=False)
+                                output_img2img_stats = gr.HTML(label='Stats')
                     
                 with gr.Row():
                     gr.Markdown('请选择一张图像掩盖掉一部分区域,并输入文本描述')

ui_functions.py

@@ -7,7 +7,7 @@ import re
 
 def change_img_choices(sample_size):
     choices = []
-    for i in range(sample_size):
+    for i in range(int(sample_size)):
         choices.append(
             '图片{}(img{})'.format(i+1,i+1)
         )