aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--javascript/images_history.js125
-rw-r--r--modules/images_history.py7
-rw-r--r--modules/ui.py40
3 files changed, 88 insertions, 84 deletions
diff --git a/javascript/images_history.js b/javascript/images_history.js
index c9a63166..620f242c 100644
--- a/javascript/images_history.js
+++ b/javascript/images_history.js
@@ -18,20 +18,26 @@ var images_history_click_image = function(){
}
var images_history_click_tab = function(){
- var tabs_box = gradioApp().getElementById("images_history_tab");
- if (!tabs_box.classList.contains(this.getAttribute("tabname"))) {
- gradioApp().getElementById(this.getAttribute("tabname") + "_images_history_renew_page").click();
- tabs_box.classList.add(this.getAttribute("tabname"))
- }
+ var tabs_box = gradioApp().getElementById("images_history_tab");
+ if (!tabs_box.classList.contains(this.getAttribute("tabname"))) {
+ gradioApp().getElementById(this.getAttribute("tabname") + "_images_history_renew_page").click();
+ tabs_box.classList.add(this.getAttribute("tabname"))
+ }
}
var images_history_close_full_view = function(){
- var box = images_history_get_parent_by_class(this, "images_history_cantainor");
- box.querySelector(".images_history_del_button").setAttribute("disabled", "disabled");
+ var box = images_history_get_parent_by_class(this, "images_history_cantainor");
+ box.querySelector(".images_history_del_button").setAttribute("disabled", "disabled");
+}
+
+function images_history_disabled_del(){
+ gradioApp().querySelectorAll(".images_history_del_button").forEach(function(btn){
+ btn.setAttribute('disabled','disabled');
+ });
}
function images_history_get_parent_by_class(item, class_name){
- var parent = item.parentElement;
+ var parent = item.parentElement;
while(!parent.classList.contains(class_name)){
parent = parent.parentElement;
}
@@ -39,14 +45,15 @@ function images_history_get_parent_by_class(item, class_name){
}
function images_history_get_parent_by_tagname(item, tagname){
- var parent = item.parentElement;
- tagname = tagname.toUpperCase()
+ var parent = item.parentElement;
+ tagname = tagname.toUpperCase()
while(parent.tagName != tagname){
- console.log(parent.tagName, tagname)
+ console.log(parent.tagName, tagname)
parent = parent.parentElement;
}
return parent;
}
+
function images_history_hide_buttons(hidden_list, gallery){
var buttons = gallery.querySelectorAll(".gallery-item");
var num = 0;
@@ -54,7 +61,7 @@ function images_history_hide_buttons(hidden_list, gallery){
if (e.style.display == "none"){
num += 1;
}
- })
+ });
if (num == hidden_list.length){
setTimeout(images_history_hide_buttons, 10, hidden_list, gallery);
}
@@ -74,14 +81,15 @@ function images_history_set_image_info(button){
if(e.style.display != "none"){
i += 1;
}
- })
+ });
var gallery = images_history_get_parent_by_class(button, "images_history_cantainor");
var set_btn = gallery.querySelector(".images_history_set_index");
- set_btn.setAttribute("img_index", index);
+ var curr_idx = set_btn.getAttribute("img_index", index);
+ if (curr_idx != index) {
+ set_btn.setAttribute("img_index", index);
+ images_history_disabled_del();
+ }
set_btn.click();
- gradioApp().querySelectorAll(".images_history_del_button").forEach(function(btn){
- btn.setAttribute('disabled','disabled');
- })
}
@@ -102,24 +110,24 @@ function images_history_delete(tabname, img_path, img_file_name, page_index, fil
if (e.style.display != 'none'){
buttons.push(e);
}
- });
-
+ });
var img_num = buttons.length / 2;
if (img_num === 1){
setTimeout(function(tabname){
gradioApp().getElementById(tabname + '_images_history_renew_page').click();
}, 30, tabname);
- } else {
+ } else {
buttons[image_index].style.display = 'none';
buttons[image_index + img_num].style.display = 'none';
var bnt;
if (image_index >= img_num - 1){
btn = buttons[img_num - 2];
- } else {
+ } else {
btn = buttons[image_index + 1] ;
- }
+ }
setTimeout(function(btn){btn.click()}, 30, btn);
- }
+ }
+ images_history_disabled_del();
return [tabname, img_path, img_file_name, page_index, filenames, image_index];
}
@@ -132,61 +140,58 @@ function images_history_turnpage(img_path, page_index, image_index, tabname){
}
function images_history_enable_del_buttons(){
- gradioApp().querySelectorAll(".images_history_del_button").forEach(function(btn){
- btn.removeAttribute('disabled');
+ gradioApp().querySelectorAll(".images_history_del_button").forEach(function(btn){
+ btn.removeAttribute('disabled');
})
}
function images_history_init(){
- if (gradioApp().getElementById('txt2img_images_history_renew_page') == null) {
- setTimeout(images_history_init, 500);
- } else {
+ var load_txt2img_button = gradioApp().getElementById('txt2img_images_history_renew_page')
+ if (load_txt2img_button){
for (var i in images_history_tab_list ){
tab = images_history_tab_list[i];
gradioApp().getElementById(tab + '_images_history').classList.add("images_history_cantainor");
gradioApp().getElementById(tab + '_images_history_set_index').classList.add("images_history_set_index");
gradioApp().getElementById(tab + '_images_history_del_button').classList.add("images_history_del_button");
- gradioApp().getElementById(tab + '_images_history_gallery').classList.add("images_history_gallery");
-
-
+ gradioApp().getElementById(tab + '_images_history_gallery').classList.add("images_history_gallery");
+
}
var tabs_box = gradioApp().getElementById("tab_images_history").querySelector("div").querySelector("div").querySelector("div");
- tabs_box.setAttribute("id", "images_history_tab");
- tabs_box.classList.add(images_history_tab_list[0]);
- gradioApp().getElementById("txt2img_images_history_renew_page").click();
- }
+ tabs_box.setAttribute("id", "images_history_tab");
+ var tab_btns = tabs_box.querySelectorAll("button");
+ for (var i in images_history_tab_list){
+ var tabname = images_history_tab_list[i]
+ tab_btns[i].setAttribute("tabname", tabname);
+ tab_btns[i].addEventListener('click', images_history_click_tab);
+ }
+ tabs_box.classList.add(images_history_tab_list[0]);
+ load_txt2img_button.click();
+ } else {
+ setTimeout(images_history_init, 500);
+ }
}
var images_history_tab_list = ["txt2img", "img2img", "extras"];
-var images_history_start_flag = false;
-
-onUiUpdate(function(){
- var tab = gradioApp().getElementById("images_history_tab");
- if (tab) {
- if (!images_history_start_flag){
- images_history_init();
- images_history_start_flag = true;
- }
- var tab_btns = gradioApp().getElementById("images_history_tab").querySelectorAll("button");
- for (var i in images_history_tab_list ){
- var buttons = gradioApp().querySelectorAll('#' + images_history_tab_list[i] + '_images_history .gallery-item');
- buttons.forEach(function(bnt){
- bnt.addEventListener('click', images_history_click_image, true);
- });
- var tabname = images_history_tab_list[i]
- tab_btns[i].setAttribute("tabname", tabname);
- tab_btns[i].addEventListener('click', images_history_click_tab, true);
+setTimeout(images_history_init, 500)
+document.addEventListener("DOMContentLoaded", function() {
+ var mutationObserver = new MutationObserver(function(m){
+ for (var i in images_history_tab_list ){
+ var buttons = gradioApp().querySelectorAll('#' + images_history_tab_list[i] + '_images_history .gallery-item');
+ buttons.forEach(function(bnt){
+ bnt.addEventListener('click', images_history_click_image, true);
+ });
// var cls_btn = gradioApp().getElementById(tabname + '_images_history_gallery').querySelector("svg");
// if (cls_btn){
- // cls_btn.addEventListener('click', images_history_close_full_view, false);
+ // cls_btn.addEventListener('click', images_history_close_full_view, false);
// }
// console.log(cls_btn, cls_btn.parentElement.parentElement)
// if (cls_btn) {
- // cls_btn = images_history_get_parent_by_tagname(cls_btn, "BUTTON");
- // cls_btn.addEventListener('click', images_history_close_full_view, true);
- // }
- }
+ // cls_btn = images_history_get_parent_by_tagname(cls_btn, "BUTTON");
+ // cls_btn.addEventListener('click', images_history_close_full_view, true);
+ }
+ });
+ mutationObserver.observe( gradioApp(), { childList:true, subtree:true });
+
+});
- }
-});
diff --git a/modules/images_history.py b/modules/images_history.py
index 2bc4b7ee..1bca0ad9 100644
--- a/modules/images_history.py
+++ b/modules/images_history.py
@@ -61,7 +61,7 @@ def delete_image(tabname, dir_name, name, page_index, filenames, image_index):
os.remove(path)
txt_file = os.path.splitext(path)[0] + ".txt"
if os.path.exists(txt_file):
- os.remove(txt_file)
+ os.remove(txt_file)
new_file_list = []
for f in filenames:
if f == name:
@@ -88,7 +88,7 @@ def show_images_history(gr, opts, tabname, run_pnginfo, switch_dict):
end_page = gr.Button('End Page')
with gr.Row(elem_id=tabname + "_images_history"):
with gr.Row():
- with gr.Column(scale=2):
+ with gr.Column(scale=2):
history_gallery = gr.Gallery(show_label=False, elem_id=tabname + "_images_history_gallery").style(grid=6)
delete = gr.Button('Delete', elem_id=tabname + "_images_history_del_button")
with gr.Column():
@@ -126,9 +126,10 @@ def show_images_history(gr, opts, tabname, run_pnginfo, switch_dict):
#other funcitons
set_index.click(show_image_info, _js="images_history_get_current_img", inputs=[tabname_box, img_path, filenames], outputs=[img_file_name, image_index, hide_image])
+ img_file_name.change(fn=None, _js="images_history_enable_del_buttons", inputs=None, outputs=None)
delete.click(delete_image,_js="images_history_delete", inputs=[tabname_box, img_path, img_file_name, page_index, filenames, image_index], outputs=[page_index, filenames])
hide_image.change(fn=run_pnginfo, inputs=[hide_image], outputs=[info1, img_file_info, info2])
- hide_image.change(fn=None, _js="images_history_enable_del_buttons", inputs=None, outputs=None)
+
#pnginfo.click(fn=run_pnginfo, inputs=[hide_image], outputs=[info1, img_file_info, info2])
switch_dict["fn"](pnginfo_send_to_txt2img, switch_dict["t2i"], img_file_info, 'switch_to_txt2img')
switch_dict["fn"](pnginfo_send_to_img2img, switch_dict["i2i"], img_file_info, 'switch_to_img2img_img2img')
diff --git a/modules/ui.py b/modules/ui.py
index 94297ba6..8cd12b51 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -39,7 +39,7 @@ import modules.generation_parameters_copypaste
from modules import prompt_parser
from modules.images import save_image
import modules.textual_inversion.ui
-import modules.hypernetwork.ui
+import modules.hypernetworks.ui
import modules.images_history as img_his
# this is a fix for Windows users. Without it, javascript files will be served with text/html content-type and the browser will not show any UI
@@ -554,6 +554,7 @@ def create_ui(wrap_gradio_gpu_call):
custom_inputs = modules.scripts.scripts_txt2img.setup_ui(is_img2img=False)
with gr.Column(variant='panel'):
+
with gr.Group():
txt2img_preview = gr.Image(elem_id='txt2img_preview', visible=False)
txt2img_gallery = gr.Gallery(label='Output', show_label=False, elem_id='txt2img_gallery').style(grid=4)
@@ -573,9 +574,9 @@ def create_ui(wrap_gradio_gpu_call):
with gr.Row():
download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False)
- with gr.Group():
- html_info = gr.HTML()
- generation_info = gr.Textbox(visible=False)
+ with gr.Group():
+ html_info = gr.HTML()
+ generation_info = gr.Textbox(visible=False)
connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)
connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)
@@ -669,7 +670,6 @@ def create_ui(wrap_gradio_gpu_call):
]
modules.generation_parameters_copypaste.connect_paste(paste, txt2img_paste_fields, txt2img_prompt)
token_button.click(fn=update_token_counter, inputs=[txt2img_prompt, steps], outputs=[token_counter])
-
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_deepbooru, img2img_prompt_style_apply, img2img_save_style, paste, token_counter, token_button = create_toprow(is_img2img=True)
@@ -762,10 +762,10 @@ def create_ui(wrap_gradio_gpu_call):
with gr.Row():
download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False)
- with gr.Group():
- html_info = gr.HTML()
- generation_info = gr.Textbox(visible=False)
-
+ with gr.Group():
+ html_info = gr.HTML()
+ generation_info = gr.Textbox(visible=False)
+
connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)
connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)
@@ -1016,6 +1016,13 @@ def create_ui(wrap_gradio_gpu_call):
inputs=[image],
outputs=[html, generation_info, html2],
)
+ #images history
+ images_history_switch_dict = {
+ "fn":modules.generation_parameters_copypaste.connect_paste,
+ "t2i":txt2img_paste_fields,
+ "i2i":img2img_paste_fields
+ }
+ images_history = img_his.create_history_tabs(gr, opts, wrap_gradio_call(modules.extras.run_pnginfo), images_history_switch_dict)
with gr.Blocks() as modelmerger_interface:
with gr.Row().style(equal_height=False):
@@ -1285,16 +1292,7 @@ Requested path was: {f}
opts.save(shared.config_filename)
- return f'{changed} settings changed.', opts.dumpjson()
-
- #images history
- images_history_switch_dict = {
- "fn":modules.generation_parameters_copypaste.connect_paste,
- "t2i":txt2img_paste_fields,
- "i2i":img2img_paste_fields
- }
- images_history = img_his.create_history_tabs(gr, opts, wrap_gradio_call(modules.extras.run_pnginfo), images_history_switch_dict)
-
+ return f'{changed} settings changed.', opts.dumpjson()
def run_settings_single(value, key):
if not opts.same_type(value, opts.data_labels[key].default):
@@ -1393,11 +1391,10 @@ Requested path was: {f}
(img2img_interface, "img2img", "img2img"),
(extras_interface, "Extras", "extras"),
(pnginfo_interface, "PNG Info", "pnginfo"),
- (modelmerger_interface, "Checkpoint Merger", "modelmerger"),
(images_history, "History", "images_history"),
+ (modelmerger_interface, "Checkpoint Merger", "modelmerger"),
(train_interface, "Train", "ti"),
(settings_interface, "Settings", "settings"),
-
]
with open(os.path.join(script_path, "style.css"), "r", encoding="utf8") as file:
@@ -1616,3 +1613,4 @@ if 'gradio_routes_templates_response' not in globals():
gradio_routes_templates_response = gradio.routes.templates.TemplateResponse
gradio.routes.templates.TemplateResponse = template_response
+
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-21 04:22:23 +0000