lllyasviel/stable-diffusion-webui-forge
1
0
Fork 0
mirror of https://github.com/lllyasviel/stable-diffusion-webui-forge.git synced 2026-04-29 02:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add source_text_component to Results paste buttons (#2349)" (#2367)

Browse Source 
This reverts commit 1f140749d4.
This commit is contained in:
DenOfEquity
2024-11-23 17:35:49 +00:00
committed by GitHub
parent ad983c99d9
commit c9850c8436
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/ui_common.py
View File

@@ -15,16 +15,17 @@ import modules.infotext_utils as parameters_copypaste
folder_symbol = '\U0001f4c2' # 📂 folder_symbol = '\U0001f4c2' # 📂
refresh_symbol = '\U0001f504' # 🔄 refresh_symbol = '\U0001f504' # 🔄
def update_generation_info(generation_info, html_info, img_index): def update_generation_info(generation_info, html_info, img_index):
try: try:
generation_info = json.loads(generation_info) generation_info = json.loads(generation_info)
if img_index < 0 or img_index >= len(generation_info["infotexts"]): if img_index < 0 or img_index >= len(generation_info["infotexts"]):
return html_info, gr.update(), html_info return html_info, gr.update()
return plaintext_to_html(generation_info["infotexts"][img_index]), gr.update(), generation_info["infotexts"][img_index] return plaintext_to_html(generation_info["infotexts"][img_index]), gr.update()
except Exception: except Exception:
pass pass
# if the json parse or anything else fails, just return the old html_info # if the json parse or anything else fails, just return the old html_info
return html_info, gr.update(), html_info return html_info, gr.update()
def plaintext_to_html(text, classname=None): def plaintext_to_html(text, classname=None):
@@ -153,7 +154,6 @@ class OutputPanel:
gallery = None gallery = None
generation_info = None generation_info = None
infotext = None infotext = None
infotext_plaintext = None
html_log = None html_log = None
button_upscale = None button_upscale = None
@@ -217,14 +217,13 @@ def create_output_panel(tabname, outdir, toprow=None):
res.html_log = gr.HTML(elem_id=f'html_log_{tabname}', elem_classes="html-log") res.html_log = gr.HTML(elem_id=f'html_log_{tabname}', elem_classes="html-log")
res.generation_info = gr.Textbox(visible=False, elem_id=f'generation_info_{tabname}') res.generation_info = gr.Textbox(visible=False, elem_id=f'generation_info_{tabname}')
res.infotext_plaintext = gr.Textbox(visible=False, elem_id=f'infotext_plaintext_{tabname}')
if tabname == 'txt2img' or tabname == 'img2img': if tabname == 'txt2img' or tabname == 'img2img':
generation_info_button = gr.Button(visible=False, elem_id=f"{tabname}_generation_info_button") generation_info_button = gr.Button(visible=False, elem_id=f"{tabname}_generation_info_button")
generation_info_button.click( generation_info_button.click(
fn=update_generation_info, fn=update_generation_info,
_js="function(x, y, z){ return [x, y, selected_gallery_index()] }", _js="function(x, y, z){ return [x, y, selected_gallery_index()] }",
inputs=[res.generation_info, res.infotext, res.infotext], inputs=[res.generation_info, res.infotext, res.infotext],
outputs=[res.infotext, res.infotext, res.infotext_plaintext], outputs=[res.infotext, res.infotext],
show_progress=False, show_progress=False,
) )
@@ -262,8 +261,7 @@ def create_output_panel(tabname, outdir, toprow=None):
else: else:
res.generation_info = gr.HTML(elem_id=f'html_info_x_{tabname}') res.generation_info = gr.HTML(elem_id=f'html_info_x_{tabname}')
res.infotext = gr.HTML(elem_id=f'html_info_{tabname}', elem_classes="infotext") res.infotext = gr.HTML(elem_id=f'html_info_{tabname}', elem_classes="infotext")
res.infotext_plaintext = gr.HTML(visible=False, elem_id=f'infotext_plaintext_{tabname}', elem_classes="infotext") res.html_log = gr.HTML(elem_id=f'html_log_{tabname}')
res.html_log = gr.HTML(elem_id=f'html_log_{tabname}', elem_classes="html-log")
paste_field_names = [] paste_field_names = []
if tabname == "txt2img": if tabname == "txt2img":
@@ -273,7 +271,7 @@ def create_output_panel(tabname, outdir, toprow=None):
for paste_tabname, paste_button in buttons.items(): for paste_tabname, paste_button in buttons.items():
parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding( parameters_copypaste.register_paste_params_button(parameters_copypaste.ParamBinding(
paste_button=paste_button, tabname=paste_tabname, source_tabname="txt2img" if tabname == "txt2img" else None, source_text_component=res.infotext_plaintext, source_image_component=res.gallery, paste_button=paste_button, tabname=paste_tabname, source_tabname="txt2img" if tabname == "txt2img" else None, source_image_component=res.gallery,
paste_field_names=paste_field_names paste_field_names=paste_field_names
)) ))