getting better

This commit is contained in:
tim h 2023-07-08 17:45:47 -05:00
parent 5b3782e82a
commit 7b1cd4f267
3 changed files with 17 additions and 6 deletions

View file

@ -218,13 +218,22 @@
<div id="controlNetModule-ac-select" class="controlnetElement"></div> <div id="controlNetModule-ac-select" class="controlnetElement"></div>
<label id="cnModelLabel" class="controlnetElement">Model</label> <label id="cnModelLabel" class="controlnetElement">Model</label>
<div id="controlNetModel-ac-select" class="controlnetElement"></div> <div id="controlNetModel-ac-select" class="controlnetElement"></div>
<label id="cnModelLabel" class="controlnetElement"> <label id="cnControlLabel" class="controlnetElement">
Control Mode Control Mode
</label> </label>
<select id="controlNetMode-select" class="controlnetElement"> <select id="controlNetMode-select" class="controlnetElement">
<option value="Balanced">prompt &Equal; CN</option> <option value="Balanced">balanced</option>
<option value="My prompt is more important">prompt &GT; CN</option> <option value="My prompt is more important">+prompt</option>
<option value="ControlNet is more important">prompt &LT; CN</option> <option value="ControlNet is more important">+CN</option>
</select>
<br />
<label id="cnResizeLabel" class="controlnetElement">
Resize Mode
</label>
<select id="controlNetResize-select" class="controlnetElement">
<option value="Just Resize">resize</option>
<option value="Crop and Resize">+crop</option>
<option value="Resize and Fill">+fill</option>
</select> </select>
<!-- <div id="referenceStyleFidelity" class="controlnetElement"></div> --> <!-- <div id="referenceStyleFidelity" class="controlnetElement"></div> -->
</div> </div>

View file

@ -144,7 +144,7 @@ const extensions = {
let opt = null; let opt = null;
opt = this.controlNetModules.module_list opt = this.controlNetModules.module_list
.filter((m) => m.includes("inpaint_")) // why is there just "inpaint" in the modules if it's not in the ui .filter((m) => m.includes("inpaint")) // why is there just "inpaint" in the modules if it's not in the ui
.map((option) => ({ .map((option) => ({
name: option, name: option,
value: option, value: option,
@ -152,7 +152,7 @@ const extensions = {
opt.push({ opt.push({
name: "inpaint_global_harmonious", name: "inpaint_global_harmonious",
value: "inpaint_global_harmonious", // WTF WHY IS THIS ONE NOT LISTED IN MODULES BUT DISTINCT IN THE API CALL?!?!?!??!??! value: "inpaint_global_harmonious", // WTF WHY IS THIS ONE NOT LISTED IN MODULES BUT DISTINCT IN THE API CALL?!?!?!??!??! it is slightly different from "inpaint" from what i can tell
}); });
controlNetModuleAutoComplete.options = opt; controlNetModuleAutoComplete.options = opt;

View file

@ -2853,6 +2853,7 @@ function addControlNetToAlwaysOnScripts(state, initCanvas, maskCanvas) {
model: extensions.selectedControlNetModel, model: extensions.selectedControlNetModel,
control_mode: document.getElementById("controlNetMode-select").value, control_mode: document.getElementById("controlNetMode-select").value,
processor_res: 64, processor_res: 64,
resize_mode: document.getElementById("controlNetResize-select").value,
// resize mode? // resize mode?
// weights / steps? // weights / steps?
}, },
@ -2866,6 +2867,7 @@ function addControlNetToAlwaysOnScripts(state, initCanvas, maskCanvas) {
input_image: initCanvas.toDataURL(), input_image: initCanvas.toDataURL(),
mask: maskCanvas.toDataURL(), mask: maskCanvas.toDataURL(),
processor_res: 64, processor_res: 64,
resize_mode: document.getElementById("controlNetResize-select").value,
// resize mode? // resize mode?
// weights / steps? // weights / steps?
}, },