Merge branch 'round-float-widgets' of https://github.com/chrisgoringe/ComfyUI

This commit is contained in:
comfyanonymous 2023-09-09 03:07:57 -04:00
commit 5c8b7ea03c
1 changed files with 11 additions and 3 deletions

View File

@ -2,14 +2,19 @@ import { api } from "./api.js"
function getNumberDefaults(inputData, defaultStep) { function getNumberDefaults(inputData, defaultStep) {
let defaultVal = inputData[1]["default"]; let defaultVal = inputData[1]["default"];
let { min, max, step } = inputData[1]; let { min, max, step, round, precision } = inputData[1];
if (defaultVal == undefined) defaultVal = 0; if (defaultVal == undefined) defaultVal = 0;
if (min == undefined) min = 0; if (min == undefined) min = 0;
if (max == undefined) max = 2048; if (max == undefined) max = 2048;
if (step == undefined) step = defaultStep; if (step == undefined) step = defaultStep;
// precision is the number of decimal places to show.
// by default, display the the smallest number of decimal places such that changes of size step are visible.
if (precision == undefined) precision = Math.max(-Math.floor(Math.log10(step)),0)
// by default, round the value to those decimal places shown.
if (round == undefined) round = Math.round(1000000*Math.pow(0.1,precision))/1000000;
return { val: defaultVal, config: { min, max, step: 10.0 * step } }; return { val: defaultVal, config: { min, max, step: 10.0 * step, round, precision } };
} }
export function addValueControlWidget(node, targetWidget, defaultValue = "randomize", values) { export function addValueControlWidget(node, targetWidget, defaultValue = "randomize", values) {
@ -264,7 +269,10 @@ export const ComfyWidgets = {
FLOAT(node, inputName, inputData, app) { FLOAT(node, inputName, inputData, app) {
let widgetType = isSlider(inputData[1]["display"], app); let widgetType = isSlider(inputData[1]["display"], app);
const { val, config } = getNumberDefaults(inputData, 0.5); const { val, config } = getNumberDefaults(inputData, 0.5);
return { widget: node.addWidget(widgetType, inputName, val, () => {}, config) }; return { widget: node.addWidget(widgetType, inputName, val,
function (v) {
this.value = Math.round(v/config.round)*config.round;
}, config) };
}, },
INT(node, inputName, inputData, app) { INT(node, inputName, inputData, app) {
let widgetType = isSlider(inputData[1]["display"], app); let widgetType = isSlider(inputData[1]["display"], app);