Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Add multi ControlNet network selection #16

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add multi ControlNet network selection #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions javascript/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function depth_removeBackground() {
depth_lib_canvas.setBackgroundImage(0, depth_lib_canvas.renderAll.bind(depth_lib_canvas));
}

function depth_sendImage(){
function depth_sendImage(index){
if (depth_lib_canvas.backgroundImage) depth_lib_canvas.backgroundImage.opacity = 0
depth_lib_canvas.discardActiveObject();
depth_lib_canvas.renderAll()
Expand All @@ -130,9 +130,17 @@ function depth_sendImage(){
if (elem.previousElementSibling.textContent === "ControlNet"){
switch_to_txt2img()
elem.className.includes("rotate-90") && elem.parentElement.click();
const input = elem.parentElement.parentElement.querySelector("input[type='file']");
const button = elem.parentElement.parentElement.querySelector("button[aria-label='Clear']")
button && button.click();
const tabs = gradioApp().querySelector("#txt2img_script_container").querySelectorAll("#controlnet > div:nth-child(2) > .tabs > .tabitem, #controlnet > div:nth-child(2) > div:not(.tabs)")
const tab = tabs[index]
if (tab.classList.contains("tabitem")) {
tab.parentElement.firstElementChild.querySelector(`:nth-child(${Number(index) + 1})`).click()
}
const input = tab.querySelector("input[type='file']")
try {
input.previousElementSibling.previousElementSibling.querySelector("button[aria-label='Clear']").click()
} catch (e) {
console.error(e)
}
input.value = "";
input.files = list;
const event = new Event('change', { 'bubbles': true, "composed": true });
Expand Down
4 changes: 3 additions & 1 deletion scripts/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import modules.scripts as scripts
from modules import script_callbacks
from modules.shared import opts

from basicsr.utils.download_util import load_file_from_url

Expand Down Expand Up @@ -55,6 +56,7 @@ def on_ui_tabs():
with gr.Row():
png_output = gr.Button(value="Save PNG")
send_output = gr.Button(value="Send to ControlNet")
select_target_index = gr.Dropdown([str(i) for i in range(opts.control_net_max_models_num)], label="Send to", value="0", interactive=True, visible=(opts.control_net_max_models_num > 1))


width.change(None, [width, height], None, _js="(w, h) => {depth_resizeCanvas(w, h)}")
Expand All @@ -66,7 +68,7 @@ def on_ui_tabs():
bg_remove.click(None, [], None, _js="depth_removeBackground")
add.click(None, [png_input_area], None, _js="(path) => {depth_addImg(path)}")
remove.click(None, [], None, _js="depth_removeSelection")
send_output.click(None, [], None, _js="depth_sendImage")
send_output.click(None, select_target_index, None, _js="(i) => depth_sendImage(i)")
reset_btn.click(None, [], None, _js="depth_resetCanvas")

return [(depth_lib, "Depth Library", "depth_lib")]
Expand Down