diff options
| author | innovaciones <sonygarcia99@gmail.com> | 2022-09-22 01:12:39 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2022-09-22 05:12:10 +0000 |
| commit | aa1d1bf44ece3f0495873fc3129d2dba664f8c2f (patch) | |
| tree | ecf79b308bad944e2c17129937983af79f4b1c4c | |
| parent | c9ee98440bb922efffefeca20592f3fe9ebb781b (diff) | |
| download | stable-diffusion-webui-gfx803-aa1d1bf44ece3f0495873fc3129d2dba664f8c2f.tar.gz stable-diffusion-webui-gfx803-aa1d1bf44ece3f0495873fc3129d2dba664f8c2f.tar.bz2 stable-diffusion-webui-gfx803-aa1d1bf44ece3f0495873fc3129d2dba664f8c2f.zip | |
New position and interrupt integration
| -rw-r--r-- | modules/ui.py | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/modules/ui.py b/modules/ui.py index 88b6ec30..572dcfb9 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -350,11 +350,14 @@ def create_toprow(is_img2img): with gr.Column(scale=1):
with gr.Row():
- progressbar = gr.HTML(elem_id="progressbar")
+ interrupt = gr.Button('Interrupt', elem_id="interrupt")
submit = gr.Button('Generate', elem_id="generate", variant='primary')
-
- txt2img_preview = gr.Image(elem_id='txt2img_preview', visible=False)
- setup_progressbar(progressbar, txt2img_preview)
+
+ interrupt.click(
+ fn=lambda: shared.state.interrupt(),
+ inputs=[],
+ outputs=[],
+ )
with gr.Row():
if is_img2img:
@@ -390,6 +393,15 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo): txt2img_prompt, roll, txt2img_prompt_style, txt2img_negative_prompt, txt2img_prompt_style2, submit, _, txt2img_prompt_style_apply, txt2img_save_style = create_toprow(is_img2img=False)
dummy_component = gr.Label(visible=False)
+ with gr.Row(elem_id='progressRow'):
+ with gr.Column(scale=1):
+ columnEmpty = "Empty"
+
+ with gr.Column(scale=1):
+ progressbar = gr.HTML(elem_id="progressbar")
+ txt2img_preview = gr.Image(elem_id='txt2img_preview', visible=False)
+ setup_progressbar(progressbar, txt2img_preview)
+
with gr.Row().style(equal_height=False):
with gr.Column(variant='panel'):
steps = gr.Slider(minimum=1, maximum=150, step=1, label="Sampling Steps", value=20)
@@ -431,7 +443,6 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo): send_to_img2img = gr.Button('Send to img2img')
send_to_inpaint = gr.Button('Send to inpaint')
send_to_extras = gr.Button('Send to extras')
- interrupt = gr.Button('Interrupt')
with gr.Group():
html_info = gr.HTML()
@@ -480,12 +491,6 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo): outputs=[hr_options],
)
- interrupt.click(
- fn=lambda: shared.state.interrupt(),
- inputs=[],
- outputs=[],
- )
-
save.click(
fn=wrap_gradio_call(save_files),
_js="(x, y, z) => [x, y, selected_gallery_index()]",
@@ -514,6 +519,15 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo): with gr.Blocks(analytics_enabled=False) as img2img_interface:
img2img_prompt, roll, img2img_prompt_style, img2img_negative_prompt, img2img_prompt_style2, submit, img2img_interrogate, img2img_prompt_style_apply, img2img_save_style = create_toprow(is_img2img=True)
+ with gr.Row(elem_id='progressRow'):
+ with gr.Column(scale=1):
+ columnEmpty = "Empty"
+
+ with gr.Column(scale=1):
+ progressbar = gr.HTML(elem_id="progressbar")
+ img2img_preview = gr.Image(elem_id='img2img_preview', visible=False)
+ setup_progressbar(progressbar, img2img_preview)
+
with gr.Row().style(equal_height=False):
with gr.Column(variant='panel'):
with gr.Group():
@@ -562,21 +576,17 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo): custom_inputs = modules.scripts.scripts_img2img.setup_ui(is_img2img=True)
with gr.Column(variant='panel'):
- progressbar = gr.HTML(elem_id="progressbar")
with gr.Group():
img2img_preview = gr.Image(elem_id='img2img_preview', visible=False)
img2img_gallery = gr.Gallery(label='Output', elem_id='img2img_gallery').style(grid=4)
- setup_progressbar(progressbar, img2img_preview)
-
with gr.Group():
with gr.Row():
save = gr.Button('Save')
img2img_send_to_img2img = gr.Button('Send to img2img')
img2img_send_to_inpaint = gr.Button('Send to inpaint')
img2img_send_to_extras = gr.Button('Send to extras')
- interrupt = gr.Button('Interrupt')
img2img_save_style = gr.Button('Save prompt as style')
@@ -690,12 +700,6 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo): outputs=[img2img_prompt],
)
- interrupt.click(
- fn=lambda: shared.state.interrupt(),
- inputs=[],
- outputs=[],
- )
-
save.click(
fn=wrap_gradio_call(save_files),
_js="(x, y, z) => [x, y, selected_gallery_index()]",
|