Comfy-Org/ComfyUI_frontend
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI_frontend.git synced 2026-02-05 23:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix in grapg\/output

Browse Source
This commit is contained in:
tamat
2021-12-07 10:50:28 +01:00
parent 8c073dcb10
commit b6fb7de636
3 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
build/litegraph.js
View File

@@ -89,6 +89,7 @@
NO_TITLE: 1,
TRANSPARENT_TITLE: 2,
AUTOHIDE_TITLE: 3,
VERTICAL_LAYOUT: "vertical", // arrange nodes vertically
proxy: null, //used to redirect calls
node_images_path: "",
@@ -1260,7 +1261,7 @@
* Positions every node in a more readable manner
* @method arrange
*/
LGraph.prototype.arrange = function(margin) {
LGraph.prototype.arrange = function (margin, layout) {
margin = margin || 100;
var nodes = this.computeExecutionOrder(false, true);
@@ -1285,12 +1286,14 @@
var y = margin + LiteGraph.NODE_TITLE_HEIGHT;
for (var j = 0; j < column.length; ++j) {
var node = column[j];
node.pos[0] = x;
node.pos[1] = y;
if (node.size[0] > max_size) {
max_size = node.size[0];
node.pos[0] = (layout == LiteGraph.VERTICAL_LAYOUT) ? y : x;
node.pos[1] = (layout == LiteGraph.VERTICAL_LAYOUT) ? x : y;
max_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 1 : 0;
if (node.size[max_size_index] > max_size) {
max_size = node.size[max_size_index];
}
y += node.size[1] + margin + LiteGraph.NODE_TITLE_HEIGHT;
node_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 0 : 1;
y += node.size[node_size_index] + margin + LiteGraph.NODE_TITLE_HEIGHT;
}
x += max_size + margin;
}
@@ -14694,7 +14697,7 @@ if (typeof exports != "undefined") {
this.addInput("", "");
this.name_in_graph = "";
this.properties = {};
this.properties = { name: "", type: "" };
var that = this;
// Object.defineProperty(this.properties, "name", {
@@ -14771,8 +14774,7 @@ if (typeof exports != "undefined") {
else if (name == "value") {
}
}
GraphOutput.prototype.updateType = function () {
var type = this.properties.type;
if (this.type_widget)
@@ -14780,9 +14782,12 @@ if (typeof exports != "undefined") {
//update output
if (this.inputs[0].type != type) {
if (!LiteGraph.isValidConnection(this.inputs[0].type, type))
this.disconnectInput(0);
this.inputs[0].type = type;
if ( type == "action" || type == "event")
type = LiteGraph.EVENT;
if (!LiteGraph.isValidConnection(this.inputs[0].type, type))
this.disconnectInput(0);
this.inputs[0].type = type;
}
//update graph
@@ -14800,7 +14805,7 @@ if (typeof exports != "undefined") {
GraphOutput.prototype.onAction = function(action, param) {
if (this.properties.type == LiteGraph.ACTION) {
this.graph.trigger(this.properties.name, param);
this.graph.trigger( this.properties.name, param );
}
};

31
build/litegraph_mini.js
View File

@@ -89,6 +89,7 @@
NO_TITLE: 1,
TRANSPARENT_TITLE: 2,
AUTOHIDE_TITLE: 3,
VERTICAL_LAYOUT: "vertical", // arrange nodes vertically
proxy: null, //used to redirect calls
node_images_path: "",
@@ -1260,7 +1261,7 @@
* Positions every node in a more readable manner
* @method arrange
*/
LGraph.prototype.arrange = function(margin) {
LGraph.prototype.arrange = function (margin, layout) {
margin = margin || 100;
var nodes = this.computeExecutionOrder(false, true);
@@ -1285,12 +1286,14 @@
var y = margin + LiteGraph.NODE_TITLE_HEIGHT;
for (var j = 0; j < column.length; ++j) {
var node = column[j];
node.pos[0] = x;
node.pos[1] = y;
if (node.size[0] > max_size) {
max_size = node.size[0];
node.pos[0] = (layout == LiteGraph.VERTICAL_LAYOUT) ? y : x;
node.pos[1] = (layout == LiteGraph.VERTICAL_LAYOUT) ? x : y;
max_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 1 : 0;
if (node.size[max_size_index] > max_size) {
max_size = node.size[max_size_index];
}
y += node.size[1] + margin + LiteGraph.NODE_TITLE_HEIGHT;
node_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 0 : 1;
y += node.size[node_size_index] + margin + LiteGraph.NODE_TITLE_HEIGHT;
}
x += max_size + margin;
}
@@ -14694,7 +14697,7 @@ if (typeof exports != "undefined") {
this.addInput("", "");
this.name_in_graph = "";
this.properties = {};
this.properties = { name: "", type: "" };
var that = this;
// Object.defineProperty(this.properties, "name", {
@@ -14771,8 +14774,7 @@ if (typeof exports != "undefined") {
else if (name == "value") {
}
}
GraphOutput.prototype.updateType = function () {
var type = this.properties.type;
if (this.type_widget)
@@ -14780,9 +14782,12 @@ if (typeof exports != "undefined") {
//update output
if (this.inputs[0].type != type) {
if (!LiteGraph.isValidConnection(this.inputs[0].type, type))
this.disconnectInput(0);
this.inputs[0].type = type;
if ( type == "action" || type == "event")
type = LiteGraph.EVENT;
if (!LiteGraph.isValidConnection(this.inputs[0].type, type))
this.disconnectInput(0);
this.inputs[0].type = type;
}
//update graph
@@ -14800,7 +14805,7 @@ if (typeof exports != "undefined") {
GraphOutput.prototype.onAction = function(action, param) {
if (this.properties.type == LiteGraph.ACTION) {
this.graph.trigger(this.properties.name, param);
this.graph.trigger( this.properties.name, param );
}
};

16
src/nodes/base.js
View File

@@ -562,7 +562,7 @@
this.addInput("", "");
this.name_in_graph = "";
this.properties = {};
this.properties = { name: "", type: "" };
var that = this;
// Object.defineProperty(this.properties, "name", {
@@ -639,8 +639,7 @@
else if (name == "value") {
}
}
GraphOutput.prototype.updateType = function () {
var type = this.properties.type;
if (this.type_widget)
@@ -648,9 +647,12 @@
//update output
if (this.inputs[0].type != type) {
if (!LiteGraph.isValidConnection(this.inputs[0].type, type))
this.disconnectInput(0);
this.inputs[0].type = type;
if ( type == "action" || type == "event")
type = LiteGraph.EVENT;
if (!LiteGraph.isValidConnection(this.inputs[0].type, type))
this.disconnectInput(0);
this.inputs[0].type = type;
}
//update graph
@@ -668,7 +670,7 @@
GraphOutput.prototype.onAction = function(action, param) {
if (this.properties.type == LiteGraph.ACTION) {
this.graph.trigger(this.properties.name, param);
this.graph.trigger( this.properties.name, param );
}
};