Skip to content

Commit

Permalink
almost there
Browse files Browse the repository at this point in the history
  • Loading branch information
FizzleDorf committed Mar 31, 2023
2 parents a295d74 + fbe3df1 commit 521a0ee
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ temp/
custom_nodes/
!custom_nodes/example_node.py.example
extra_model_paths.yaml
/.vs
Binary file not shown.
20 changes: 16 additions & 4 deletions web/extensions/core/widgetInputs.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ const CONVERTED_TYPE = "converted-widget";
const VALID_TYPES = ["STRING", "combo", "number"];

function isConvertableWidget(widget, config) {
return VALID_TYPES.includes(widget.type) || VALID_TYPES.includes(config[0]);
return VALID_TYPES.includes(widget.type) || VALID_TYPES.includes(config[0]);
}


function hideWidget(node, widget, suffix = "") {
widget.origType = widget.type;
widget.origComputeSize = widget.computeSize;
Expand All @@ -23,7 +24,7 @@ function hideWidget(node, widget, suffix = "") {
return widget.value;
};

// Hide any linked widgets, e.g. seed+randomize
// Hide any linked widgets, e.g. seed+seedControl
if (widget.linkedWidgets) {
for (const w of widget.linkedWidgets) {
hideWidget(node, w, ":" + widget.name);
Expand All @@ -40,7 +41,7 @@ function showWidget(widget) {
delete widget.origComputeSize;
delete widget.origSerializeValue;

// Hide any linked widgets, e.g. seed+randomize
// Hide any linked widgets, e.g. seed+seedControl
if (widget.linkedWidgets) {
for (const w of widget.linkedWidgets) {
showWidget(w);
Expand Down Expand Up @@ -172,6 +173,10 @@ app.registerExtension({
node.pos = pos;
node.connect(0, this, slot);
node.title = input.name;
if (node.title == "seed") {
node.widgets.addSeedControlWidget(node, node.widgets[0], "randomize");
value.widget.linkedWidgets = [seedControl];
}

// Prevent adding duplicates due to triple clicking
input[ignoreDblClick] = true;
Expand All @@ -188,7 +193,7 @@ app.registerExtension({
constructor() {
this.addOutput("connect to widget input", "*");
this.serialize_widgets = true;
this.isVirtualNode = true;
this.isVirtualNode = true;
}

applyToGraph() {
Expand Down Expand Up @@ -284,10 +289,17 @@ app.registerExtension({
}
}

<<<<<<< HEAD
if (widget.type === "combo") {
addSeedControlWidget(this, widget, "randomize");
}

=======
if (widget.type === "combo")
addSeedControlWidget(this, widget, "randomize");


>>>>>>> fbe3df1ec837d298aaab68bab81c967182d2bab6
// When our value changes, update other widgets to reflect our changes
// e.g. so LoadImage shows correct image
const callback = widget.callback;
Expand Down
10 changes: 8 additions & 2 deletions web/scripts/app.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ComfyWidgets } from "./widgets.js";
import { addSeedControlWidget, ComfyWidgets } from "./widgets.js";
import { ComfyUI } from "./ui.js";
import { api } from "./api.js";
import { defaultGraph } from "./defaultGraph.js";
Expand Down Expand Up @@ -771,6 +771,13 @@ class ComfyApp {
widget.value = widget.value.slice(7);
}
}

if (widget.name == "seed control after generating") {
if (widget.value == true) {
widget.value = "randomize";

}
}
}
if (widget.name == "seed control after generating") {
if (widget.value == true) {
Expand All @@ -780,7 +787,6 @@ class ComfyApp {
}
}
}

this.#invokeExtensions("loadedGraphNode", node);
}
}
Expand Down
4 changes: 4 additions & 0 deletions web/scripts/widgets.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "randomi
}

function seedWidget(node, inputName, inputData) {
<<<<<<< HEAD
const seed = ComfyWidgets.COMBO(node, inputName, inputData);
=======
const seed = ComfyWidgets.INT(node, inputName, inputData);
>>>>>>> fbe3df1ec837d298aaab68bab81c967182d2bab6
const seedControl = addSeedControlWidget(node, seed.widget, "randomize");

seed.widget.linkedWidgets = [seedControl];
Expand Down

0 comments on commit 521a0ee

Please sign in to comment.