Formatting js

This commit is contained in:
Rhys Yang
2023-10-14 00:08:20 +08:00
parent df6a43ab6a
commit 6a2df87b1b
2 changed files with 20 additions and 22 deletions
+4 -5
View File
@@ -27,7 +27,7 @@ app.registerExtension({
// Resize the node
const nodeWidth = this.size[0];
const nodeHeight = this.size[1];
this.setSize([nodeWidth*2, nodeHeight * 1.2]);
this.setSize([nodeWidth * 2, nodeHeight * 1.2]);
return result;
};
@@ -39,15 +39,14 @@ app.registerExtension({
let ar_message;
if (message.text[0] === "custom") {
ar_message = "Custom aspect ratio: " + message.text[2] + " x " + message.text[3];
}
else{
} else {
ar_message = `Optimal resolution for ${message.text[1]} model
with aspect ratio ${message.text[0]}: ${message.text[2]} x ${message.text[3]}`;
}
const start_at_float = parseFloat(message.text[5])
const base_percentage = Math.round(start_at_float* 100) + "%";
const refiner_percentage = Math.round((1-start_at_float)* 100) + "%";
const base_percentage = Math.round(start_at_float * 100) + "%";
const refiner_percentage = Math.round((1 - start_at_float) * 100) + "%";
const step_message = `Total steps: ${message.text[4]}, refiner start at ${base_percentage},
Base steps: ${message.text[6]} (${base_percentage}), Refiner steps: ${message.text[7]} (${refiner_percentage})`;
+16 -17
View File
@@ -4,11 +4,13 @@
*/
import {app} from "../../scripts/app.js";
import {ComfyWidgets} from "../../scripts/widgets.js";
const LAST_SEED_BUTTON_LABEL = "(Use Last Queued Seed)";
const SPECIAL_SEED_RANDOM = -1;
const SPECIAL_SEED_INCREMENT = -2;
const SPECIAL_SEED_DECREMENT = -3;
const SPECIAL_SEEDS = [SPECIAL_SEED_RANDOM, SPECIAL_SEED_INCREMENT, SPECIAL_SEED_DECREMENT];
class SeedControl {
constructor(node) {
this.lastSeed = undefined;
@@ -21,8 +23,7 @@ class SeedControl {
handleAction && handleAction.call(this.node, action);
if (action === "Randomize each time") {
this.seedWidget.value = SPECIAL_SEED_RANDOM;
}
else if (action === "Use last queued seed") {
} else if (action === "Use last queued seed") {
this.seedWidget.value = this.lastSeed != null ? this.lastSeed : this.seedWidget.value;
this.lastSeedButton.name = LAST_SEED_BUTTON_LABEL;
this.lastSeedButton.disabled = true;
@@ -32,8 +33,7 @@ class SeedControl {
for (const [i, w] of this.node.widgets.entries()) {
if (w.name === "seed") {
this.seedWidget = w;
}
else if (w.name === "control_after_generate") {
} else if (w.name === "control_after_generate") {
this.node.widgets.splice(i, 1);
}
}
@@ -45,16 +45,16 @@ class SeedControl {
const randomRange = (randMax - Math.max(0, randMin)) / (this.seedWidget.options.step / 10);
this.node.addWidget("button", "Randomize seed each time", null, () => {
this.seedWidget.value = SPECIAL_SEED_RANDOM;
}, { serialize: false });
}, {serialize: false});
this.node.addWidget("button", "New fixed random seed", null, () => {
this.seedWidget.value =
Math.floor(Math.random() * randomRange) * (this.seedWidget.options.step / 10) + randMin;
}, { serialize: false });
}, {serialize: false});
this.lastSeedButton = this.node.addWidget("button", LAST_SEED_BUTTON_LABEL, null, () => {
this.seedWidget.value = this.lastSeed != null ? this.lastSeed : this.seedWidget.value;
this.lastSeedButton.name = LAST_SEED_BUTTON_LABEL;
this.lastSeedButton.disabled = true;
}, { serialize: false });
}, {serialize: false});
this.lastSeedButton.disabled = true;
this.seedWidget.serializeValue = async (node, index) => {
const inputSeed = this.seedWidget.value;
@@ -65,8 +65,7 @@ class SeedControl {
if (typeof this.lastSeed === "number" && !SPECIAL_SEEDS.includes(this.lastSeed)) {
if (inputSeed === SPECIAL_SEED_INCREMENT) {
this.serializedCtx.seedUsed = this.lastSeed + 1;
}
else if (inputSeed === SPECIAL_SEED_INCREMENT) {
} else if (inputSeed === SPECIAL_SEED_INCREMENT) {
this.serializedCtx.seedUsed = this.lastSeed - 1;
}
}
@@ -74,8 +73,7 @@ class SeedControl {
this.serializedCtx.seedUsed =
Math.floor(Math.random() * randomRange) * (this.seedWidget.options.step / 10) + randMin;
}
}
else {
} else {
this.serializedCtx.seedUsed = this.seedWidget.value;
}
node.widgets_values[index] = this.serializedCtx.seedUsed;
@@ -87,8 +85,7 @@ class SeedControl {
if (this.lastSeedValue) {
this.lastSeedValue.value = `Last Seed: ${this.serializedCtx.seedUsed}`;
}
}
else {
} else {
this.lastSeedButton.name = LAST_SEED_BUTTON_LABEL;
this.lastSeedButton.disabled = true;
}
@@ -107,18 +104,18 @@ class SeedControl {
this.node.properties["showLastSeed"] = !this.node.properties["showLastSeed"];
if (this.node.properties["showLastSeed"]) {
this.addLastSeedValue();
}
else {
} else {
this.removeLastSeedValue();
}
},
});
};
}
addLastSeedValue() {
if (this.lastSeedValue)
return;
this.lastSeedValue = ComfyWidgets["STRING"](this.node, "last_seed", ["STRING", { multiline: true }], app).widget;
this.lastSeedValue = ComfyWidgets["STRING"](this.node, "last_seed", ["STRING", {multiline: true}], app).widget;
this.lastSeedValue.inputEl.readOnly = true;
this.lastSeedValue.inputEl.style.fontSize = "0.75rem";
this.lastSeedValue.inputEl.style.textAlign = "center";
@@ -128,6 +125,7 @@ class SeedControl {
};
this.node.computeSize();
}
removeLastSeedValue() {
if (!this.lastSeedValue)
return;
@@ -137,6 +135,7 @@ class SeedControl {
this.node.computeSize();
}
}
app.registerExtension({
name: "sd_prompt_reader.seedGen",
async beforeRegisterNodeDef(nodeType, nodeData, _app) {
@@ -147,7 +146,7 @@ app.registerExtension({
this.seedControl = new SeedControl(this);
const nodeWidth = this.size[0];
const nodeHeight = this.size[1];
this.setSize([nodeWidth*1.5, nodeHeight * 1.1]);
this.setSize([nodeWidth * 1.5, nodeHeight * 1.1]);
};
}
},