wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-26 22:30:19 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix order

Browse Source
This commit is contained in:
space-nuko 2023-06-09 22:39:54 -05:00
parent a99d706d48
commit 8f93d820bc
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
execution.py
View File

@ -135,15 +135,10 @@ def get_input_data_batches(input_data_all):
if not inherit_id or axis_id is None: if not inherit_id or axis_id is None:
axis_id = str(uuid.uuid4()) axis_id = str(uuid.uuid4())
pp(input_to_index)
pp(input_to_values)
pp(index_to_values)
indices = list(itertools.product(*index_to_coords)) indices = list(itertools.product(*index_to_coords))
combinations = list(itertools.product(*index_to_values)) combinations = list(itertools.product(*index_to_values))
pp(indices) pp(indices)
pp(combinations)
for i, indices_set in enumerate(indices): for i, indices_set in enumerate(indices):
combination = combinations[i] combination = combinations[i]

2
web/extensions/core/showGrid.js
View File

@ -266,7 +266,7 @@ app.registerExtension({
imageSizeInput.addEventListener("input", () => { imageSizeInput.addEventListener("input", () => {
this.imageSize = parseInt(imageSizeInput.value); this.imageSize = parseInt(imageSizeInput.value);
const ratio = Math.min(this.imageSize / natWidth, this.imageSize / natHeight); const ratio = Math.min(this.imageSize / this.naturalWidth, this.imageSize / this.naturalHeight);
const newWidth = this.naturalWidth * ratio; const newWidth = this.naturalWidth * ratio;
const newHeight = this.naturalHeight * ratio; const newHeight = this.naturalHeight * ratio;
this.imageWidth = newWidth; this.imageWidth = newWidth;

6
web/scripts/app.js
View File

@ -1083,10 +1083,6 @@ export class ComfyApp {
let sortedKeys = Object.keys(promptInput.inputs); let sortedKeys = Object.keys(promptInput.inputs);
sortedKeys.sort((a, b) => a.localeCompare(b)); sortedKeys.sort((a, b) => a.localeCompare(b));
// Then reverse the order since we're traversing the graph upstream,
// so application order of the inputs comes out backwards
sortedKeys = sortedKeys.reverse();
for (const inputName of sortedKeys) { for (const inputName of sortedKeys) {
const input = promptInput.inputs[inputName]; const input = promptInput.inputs[inputName];
if (typeof input === "object" && "__inputType__" in input) { if (typeof input === "object" && "__inputType__" in input) {
@ -1406,7 +1402,7 @@ export class ComfyApp {
for (let widget of node.widgets) { for (let widget of node.widgets) {
if (node.type == "KSampler" || node.type == "KSamplerAdvanced") { if (node.type == "KSampler" || node.type == "KSamplerAdvanced") {
if (widget.name == "sampler_name") { if (widget.name == "sampler_name") {
if (widget.value.startsWith("sample_")) { if (typeof widget.value === "string" && widget.value.startsWith("sample_")) {
widget.value = widget.value.slice(7); widget.value = widget.value.slice(7);
} }
} }