From 6717a58837544c64a7966818466e368c31ca1483 Mon Sep 17 00:00:00 2001 From: MakkiShizu <142442886+MakkiShizu@users.noreply.github.com> Date: Thu, 24 Apr 2025 18:59:53 +0800 Subject: [PATCH] Add `channels` to `GetImageSizeAndCount` --- nodes/image_nodes.py | 9 +++++---- web/js/jsnodes.js | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nodes/image_nodes.py b/nodes/image_nodes.py index 32531ed..de105c5 100644 --- a/nodes/image_nodes.py +++ b/nodes/image_nodes.py @@ -766,8 +766,8 @@ class GetImageSizeAndCount: "image": ("IMAGE",), }} - RETURN_TYPES = ("IMAGE","INT", "INT", "INT",) - RETURN_NAMES = ("image", "width", "height", "count",) + RETURN_TYPES = ("IMAGE","INT", "INT", "INT", "INT",) + RETURN_NAMES = ("image", "width", "height", "count", "channels",) FUNCTION = "getsize" CATEGORY = "KJNodes/image" DESCRIPTION = """ @@ -780,9 +780,10 @@ and passes it through unchanged. width = image.shape[2] height = image.shape[1] count = image.shape[0] + channels = image.shape[3] return {"ui": { - "text": [f"{count}x{width}x{height}"]}, - "result": (image, width, height, count) + "text": [f"{count}x{width}x{height}x{channels}"]}, + "result": (image, width, height, count, channels) } class ImageBatchRepeatInterleaving: diff --git a/web/js/jsnodes.js b/web/js/jsnodes.js index ae671c9..27f5a2d 100644 --- a/web/js/jsnodes.js +++ b/web/js/jsnodes.js @@ -174,6 +174,7 @@ app.registerExtension({ this.outputs[1]["label"] = "width" this.outputs[2]["label"] = "height" this.outputs[3]["label"] = "count" + this.outputs[4]["label"] = "channels" return v; } //const onGetImageSizeExecuted = nodeType.prototype.onExecuted; @@ -186,6 +187,7 @@ app.registerExtension({ this.outputs[1]["label"] = values[1] + " width" this.outputs[2]["label"] = values[2] + " height" this.outputs[3]["label"] = values[0] + " count" + this.outputs[4]["label"] = values[3] + " channels" return r } break;