Commit 26d10737 authored by AUTOMATIC's avatar AUTOMATIC
Browse files

Merge remote-tracking branch 'historytab/master'

parents f49c08ea 538bc89c

javascript/images_history.js

+57 −63
Original line number Diff line number Diff line
@@ -17,14 +17,6 @@ var images_history_click_image = function(){ 
    images_history_set_image_info(this); 

}



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"))

    }                

}



function images_history_disabled_del(){

    gradioApp().querySelectorAll(".images_history_del_button").forEach(function(btn){

        btn.setAttribute('disabled','disabled');
@@ -43,7 +35,6 @@ function images_history_get_parent_by_tagname(item, tagname){ 
    var parent = item.parentElement;

    tagname = tagname.toUpperCase()

    while(parent.tagName != tagname){

        console.log(parent.tagName, tagname)

        parent = parent.parentElement;

    }  

    return parent;
@@ -88,15 +79,15 @@ function images_history_set_image_info(button){ 
    

}



function images_history_get_current_img(tabname, image_path, files){

function images_history_get_current_img(tabname, img_index, files){

    return [

        tabname, 

        gradioApp().getElementById(tabname + '_images_history_set_index').getAttribute("img_index"),         

        image_path, 

        files

    ];

}



function images_history_delete(del_num, tabname, img_path, img_file_name, page_index, filenames, image_index){

function images_history_delete(del_num, tabname, image_index){

    image_index = parseInt(image_index);

    var tab = gradioApp().getElementById(tabname + '_images_history');

    var set_btn = tab.querySelector(".images_history_set_index");
@@ -107,6 +98,7 @@ function images_history_delete(del_num, tabname, img_path, img_file_name, page_i 
        }

    });    

    var img_num = buttons.length / 2;

    del_num = Math.min(img_num - image_index, del_num)    

    if (img_num <= del_num){

        setTimeout(function(tabname){

            gradioApp().getElementById(tabname + '_images_history_renew_page').click();
@@ -114,30 +106,28 @@ function images_history_delete(del_num, tabname, img_path, img_file_name, page_i 
    } else {

        var next_img  

        for (var i = 0; i < del_num; i++){

            if (image_index + i < image_index + img_num){

            buttons[image_index + i].style.display = 'none';

                buttons[image_index + img_num + 1].style.display = 'none';

            buttons[image_index + i + img_num].style.display = 'none';

            next_img = image_index + i + 1

        }

        }

        var bnt;

        if (next_img  >= img_num){

            btn = buttons[image_index - del_num];

            btn = buttons[image_index - 1];

        } else {            

            btn = buttons[next_img];          

        } 

        setTimeout(function(btn){btn.click()}, 30, btn);

    }

    images_history_disabled_del();  

    return [del_num, tabname, img_path, img_file_name, page_index, filenames, image_index];

   

}



function images_history_turnpage(img_path, page_index, image_index, tabname){

function images_history_turnpage(tabname){

    gradioApp().getElementById(tabname + '_images_history_del_button').setAttribute('disabled','disabled');

    var buttons = gradioApp().getElementById(tabname + '_images_history').querySelectorAll(".gallery-item");

    buttons.forEach(function(elem) {

        elem.style.display = 'block';

    })   

    return [img_path, page_index, image_index, tabname];

}



function images_history_enable_del_buttons(){
@@ -147,40 +137,46 @@ function images_history_enable_del_buttons(){ 
}



function images_history_init(){ 

    var load_txt2img_button = gradioApp().getElementById('txt2img_images_history_renew_page')

    if (load_txt2img_button){        

    var tabnames = gradioApp().getElementById("images_history_tabnames_list")   

    if (tabnames){  

        images_history_tab_list = tabnames.querySelector("textarea").value.split(",")    

        for (var i in images_history_tab_list ){

            tab = images_history_tab_list[i];

            var 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_start").setAttribute("style","padding:20px;font-size:25px");           

        }



        //preload

        if (gradioApp().getElementById("images_history_preload").querySelector("input").checked ){

            var tabs_box = gradioApp().getElementById("tab_images_history").querySelector("div").querySelector("div").querySelector("div");

            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);



            // this refreshes history upon tab switch

            // until the history is known to work well, which is not the case now, we do not do this at startup

            //tab_btns[i].addEventListener('click', images_history_click_tab);

                tab_btns[i].addEventListener('click', function(){

                    var tabs_box = gradioApp().getElementById("images_history_tab");

                    if (!tabs_box.classList.contains(this.getAttribute("tabname"))) {

                        gradioApp().getElementById(this.getAttribute("tabname") + "_images_history_start").click();

                        tabs_box.classList.add(this.getAttribute("tabname"))

                    }                

                });

            }            

            tab_btns[0].click()

        }

        tabs_box.classList.add(images_history_tab_list[0]);



        // same as above, at page load

        //load_txt2img_button.click();

    } else {

        setTimeout(images_history_init, 500);

    } 

}



var images_history_tab_list = ["txt2img", "img2img", "extras"];

var images_history_tab_list = "";

setTimeout(images_history_init, 500);

document.addEventListener("DOMContentLoaded", function() {

    var mutationObserver = new MutationObserver(function(m){

        if (images_history_tab_list != ""){

            for (var i in images_history_tab_list ){

                let tabname = images_history_tab_list[i]

                var buttons = gradioApp().querySelectorAll('#' + tabname + '_images_history .gallery-item');
@@ -188,19 +184,17 @@ document.addEventListener("DOMContentLoaded", function() { 
                    bnt.addEventListener('click', images_history_click_image, true);

                });



            // same as load_txt2img_button.click() above

            /*

                var cls_btn = gradioApp().getElementById(tabname + '_images_history_gallery').querySelector("svg");

                if (cls_btn){

                    cls_btn.addEventListener('click', function(){

                        gradioApp().getElementById(tabname + '_images_history_renew_page').click();

                    }, false);

            }*/

                }



            }     

        }

    });

    mutationObserver.observe(gradioApp(), { childList:true, subtree:true });



});

modules/images_history.py

+372 −131

File changed.

Preview size limit exceeded, changes collapsed.

modules/shared.py

+9 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ parser.add_argument('--vae-path', type=str, help='Path to Variational Autoencode 
parser.add_argument("--disable-safe-unpickle", action='store_true', help="disable checking pytorch models for malicious code", default=False)

parser.add_argument("--api", action='store_true', help="use api=True to launch the api with the webui")

parser.add_argument("--nowebui", action='store_true', help="use api=True to launch the api instead of the webui")

parser.add_argument("--browse-all-images", action='store_true', help="Allow browsing all images by Image Browser", default=False)



cmd_opts = parser.parse_args()

restricted_opts = [
@@ -332,6 +333,14 @@ options_templates.update(options_section(('sampler-params', "Sampler parameters" 
    'eta_noise_seed_delta': OptionInfo(0, "Eta noise seed delta", gr.Number, {"precision": 0}),

}))



options_templates.update(options_section(('images-history', "Images Browser"), {

    #"images_history_reconstruct_directory": OptionInfo(False, "Reconstruct output directory structure.This can greatly improve the speed of loading , but will change the original output directory structure"),

    "images_history_preload": OptionInfo(False, "Preload images at startup"),

    "images_history_num_per_page": OptionInfo(36, "Number of pictures displayed on each page"),

    "images_history_pages_num": OptionInfo(6, "Minimum number of pages per load "),   

    "images_history_grid_num": OptionInfo(6, "Number of grids in each row"),   



}))



class Options:

    data = None

modules/ui.py

+2 −2
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ def create_ui(wrap_gradio_gpu_call): 
        "i2i":img2img_paste_fields

    }



    images_history = img_his.create_history_tabs(gr, opts, wrap_gradio_call(modules.extras.run_pnginfo), images_history_switch_dict)

    images_history = img_his.create_history_tabs(gr, opts, cmd_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):
@@ -1689,7 +1689,7 @@ Requested path was: {f} 
        (img2img_interface, "img2img", "img2img"),

        (extras_interface, "Extras", "extras"),

        (pnginfo_interface, "PNG Info", "pnginfo"),

        (images_history, "History", "images_history"),

        (images_history, "Image Browser", "images_history"),

        (modelmerger_interface, "Checkpoint Merger", "modelmerger"),

        (train_interface, "Train", "ti"),

        (settings_interface, "Settings", "settings"),

CRA Git | Maintained and supported by SUSTech CRA and CCSE