StableDiffusion/WebUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some code duplication from #9348

Browse Source
This commit is contained in:
AUTOMATIC 2023-05-17 23:27:06 +03:00
parent 1d1b5da4bf
commit e5dd4b4ebf
2 changed files with 20 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
javascript/ui.js
View File

@ -441,51 +441,27 @@ function updateImg2imgResizeToTextAfterChangingImage(){
} }
function setRandomSeed(target_interface) {
let seed = gradioApp().querySelector(`#${target_interface}_seed input`);
if (!seed) { function setRandomSeed(elem_id) {
return []; var input = gradioApp().querySelector("#" + elem_id + " input");
} if (!input) return [];
seed.value = "-1";
seed.dispatchEvent(new Event("input")); input.value = "-1";
updateInput(input);
return []; return [];
} }
function setRandomSubseed(target_interface) { function switchWidthHeight(tabname) {
let subseed = gradioApp().querySelector(`#${target_interface}_subseed input`); var width = gradioApp().querySelector("#" + tabname + "_width input[type=number]");
if (!subseed) { var height = gradioApp().querySelector("#" + tabname + "_height input[type=number]");
return []; if (!width || !height) return [];
}
subseed.value = "-1";
subseed.dispatchEvent(new Event("input"));
return [];
}
function switchWidthHeightTxt2Img() { var tmp = width.value;
let width = gradioApp().querySelector("#txt2img_width input[type=number]");
let height = gradioApp().querySelector("#txt2img_height input[type=number]");
if (!width || !height) {
return [];
}
let tmp = width.value;
width.value = height.value; width.value = height.value;
height.value = tmp; height.value = tmp;
width.dispatchEvent(new Event("input"));
height.dispatchEvent(new Event("input")); updateInput(width);
updateInput(height);
return []; return [];
} }
function switchWidthHeightImg2Img() {
let width = gradioApp().querySelector("#img2img_width input[type=number]");
let height = gradioApp().querySelector("#img2img_height input[type=number]");
if (!width || !height) {
return [];
}
let tmp = width.value;
width.value = height.value;
height.value = tmp;
width.dispatchEvent(new Event("input"));
height.dispatchEvent(new Event("input"));
return [];
}

9
modules/ui.py
View File

@ -189,9 +189,8 @@ def create_seed_inputs(target_interface):
seed_resize_from_w = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from width", value=0, elem_id=f"{target_interface}_seed_resize_from_w") seed_resize_from_w = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from width", value=0, elem_id=f"{target_interface}_seed_resize_from_w")
seed_resize_from_h = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from height", value=0, elem_id=f"{target_interface}_seed_resize_from_h") seed_resize_from_h = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from height", value=0, elem_id=f"{target_interface}_seed_resize_from_h")
target_interface_state = gr.Textbox(target_interface, visible=False) random_seed.click(fn=None, _js="function(){setRandomSeed('" + target_interface + "_seed')}", show_progress=False, inputs=[], outputs=[])
random_seed.click(fn=None, _js="setRandomSeed", show_progress=False, inputs=[target_interface_state], outputs=[]) random_subseed.click(fn=None, _js="function(){setRandomSeed('" + target_interface + "_subseed')}", show_progress=False, inputs=[], outputs=[])
random_subseed.click(fn=None, _js="setRandomSubseed", show_progress=False, inputs=[target_interface_state], outputs=[])
def change_visibility(show): def change_visibility(show):
return {comp: gr_show(show) for comp in seed_extras} return {comp: gr_show(show) for comp in seed_extras}
@ -575,7 +574,7 @@ def create_ui():
txt2img_prompt.submit(**txt2img_args) txt2img_prompt.submit(**txt2img_args)
submit.click(**txt2img_args) submit.click(**txt2img_args)
res_switch_btn.click(fn=None, _js="switchWidthHeightTxt2Img", inputs=None, outputs=None, show_progress=False) res_switch_btn.click(fn=None, _js="function(){switchWidthHeight('txt2img')}", inputs=None, outputs=None, show_progress=False)
restore_progress_button.click( restore_progress_button.click(
fn=progress.restore_progress, fn=progress.restore_progress,
@ -951,7 +950,7 @@ def create_ui():
img2img_prompt.submit(**img2img_args) img2img_prompt.submit(**img2img_args)
submit.click(**img2img_args) submit.click(**img2img_args)
res_switch_btn.click(fn=None, _js="switchWidthHeightImg2Img", inputs=None, outputs=None, show_progress=False) res_switch_btn.click(fn=None, _js="function(){switchWidthHeight('img2img')}", inputs=None, outputs=None, show_progress=False)
restore_progress_button.click( restore_progress_button.click(
fn=progress.restore_progress, fn=progress.restore_progress,