From 3f52e7cbb16c3469cc54f751d4b3fe9354b294cf Mon Sep 17 00:00:00 2001
From: FizzleDorf <1fizzledorf@gmail.com>
Date: Wed, 12 Apr 2023 20:57:13 -0400
Subject: [PATCH] Seed controls added to Ksamplers (#296)

Co-authored-by: flyingshutter <flyingshutter@users.noreply.github.com>
---
 .gitignore                          |  1 +
 web/extensions/core/widgetInputs.js |  8 ++--
 web/scripts/app.js                  |  5 +++
 web/scripts/widgets.js              | 67 ++++++++++++++++++-----------
 4 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index d311a2a0..df6adbe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ temp/
 custom_nodes/
 !custom_nodes/example_node.py.example
 extra_model_paths.yaml
+/.vs
diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 865af776..3764c984 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -1,4 +1,4 @@
-import { ComfyWidgets, addRandomizeWidget } from "/scripts/widgets.js";
+import { ComfyWidgets, addValueControlWidget } from "/scripts/widgets.js";
 import { app } from "/scripts/app.js";
 
 const CONVERTED_TYPE = "converted-widget";
@@ -23,7 +23,7 @@ function hideWidget(node, widget, suffix = "") {
 		return widget.origSerializeValue ? widget.origSerializeValue() : 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);
@@ -40,7 +40,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);
@@ -285,7 +285,7 @@ app.registerExtension({
 				}
 
 				if (widget.type === "number") {
-					addRandomizeWidget(this, widget, "Random after every gen");
+					addValueControlWidget(this, widget, "fixed");
 				}
 
 				// When our value changes, update other widgets to reflect our changes
diff --git a/web/scripts/app.js b/web/scripts/app.js
index b1892fc2..2f5e7322 100644
--- a/web/scripts/app.js
+++ b/web/scripts/app.js
@@ -949,6 +949,11 @@ class ComfyApp {
 								widget.value = widget.value.slice(7);
 							}
 						}
+						if (widget.name == "control_after_generate") {
+							if (widget.value == true) {
+								widget.value = "randomize";
+							}
+						}
 					}
 				}
 			}
diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js
index d1a9c6c6..2acc5f2c 100644
--- a/web/scripts/widgets.js
+++ b/web/scripts/widgets.js
@@ -10,37 +10,54 @@ function getNumberDefaults(inputData, defaultStep) {
 	return { val: defaultVal, config: { min, max, step: 10.0 * step } };
 }
 
-export function addRandomizeWidget(node, targetWidget, name, defaultValue = false) {
-	const randomize = node.addWidget("toggle", name, defaultValue, function (v) {}, {
-		on: "enabled",
-		off: "disabled",
-		serialize: false, // Don't include this in prompt.
-	});
+export function addValueControlWidget(node, targetWidget, defaultValue = "randomize", values) {
+    const valueControl = node.addWidget("combo", "control_after_generate", defaultValue, function (v) { }, {
+        values: ["fixed", "increment", "decrement", "randomize"],
+        serialize: false, // Don't include this in prompt.
+    });
+    valueControl.afterQueued = () => {
 
-	randomize.afterQueued = () => {
-		if (randomize.value) {
-			const min = targetWidget.options?.min;
-			let max = targetWidget.options?.max;
-			if (min != null || max != null) {
-				if (max) {
-					// limit max to something that javascript can handle
-					max = Math.min(1125899906842624, max);
-				}
-				targetWidget.value = Math.floor(Math.random() * ((max ?? 9999999999) - (min ?? 0) + 1) + (min ?? 0));
-			} else {
-				targetWidget.value = Math.floor(Math.random() * 1125899906842624);
-			}
+		var v = valueControl.value;
+
+		let min = targetWidget.options.min;
+		let max = targetWidget.options.max;
+		// limit to something that javascript can handle
+		max = Math.min(1125899906842624, max);
+		min = Math.max(-1125899906842624, min);
+		let range = (max - min) / (targetWidget.options.step / 10);
+
+		//adjust values based on valueControl Behaviour
+		switch (v) {
+			case "fixed":
+				break;
+			case "increment":
+				targetWidget.value += targetWidget.options.step / 10;
+				break;
+			case "decrement":
+				targetWidget.value -= targetWidget.options.step / 10;
+				break;
+			case "randomize":
+				targetWidget.value = Math.floor(Math.random() * range) * (targetWidget.options.step / 10) + min;
+			default:
+				break;
 		}
-	};
-	return randomize;
-}
+	/*check if values are over or under their respective
+	 * ranges and set them to min or max.*/
+		if (targetWidget.value < min)
+			targetWidget.value = min;
+
+		if (targetWidget.value > max)
+			targetWidget.value = max;
+	}
+	return valueControl;	
+};
 
 function seedWidget(node, inputName, inputData) {
 	const seed = ComfyWidgets.INT(node, inputName, inputData);
-	const randomize = addRandomizeWidget(node, seed.widget, "Random seed after every gen", true);
+	const seedControl = addValueControlWidget(node, seed.widget, "randomize");
 
-	seed.widget.linkedWidgets = [randomize];
-	return { widget: seed, randomize };
+	seed.widget.linkedWidgets = [seedControl];
+	return seed;
 }
 
 const MultilineSymbol = Symbol();