mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-05-22 23:17:34 +08:00
interept_as as combo
This commit is contained in:
parent
14e114a936
commit
cde0936e42
@ -963,11 +963,17 @@ class SaveImageAdvanced(IO.ComfyNode):
|
|||||||
default="ComfyUI",
|
default="ComfyUI",
|
||||||
tooltip="The prefix for the file to save. This may include formatting information such as %date:yyyy-MM-dd% or %Empty Latent Image.width% to include values from nodes.",
|
tooltip="The prefix for the file to save. This may include formatting information such as %date:yyyy-MM-dd% or %Empty Latent Image.width% to include values from nodes.",
|
||||||
),
|
),
|
||||||
|
IO.Combo.Input(
|
||||||
|
"interept_as",
|
||||||
|
options=["Raw/Data", "sRGB"],
|
||||||
|
default="sRGB",
|
||||||
|
advanced=True,
|
||||||
|
),
|
||||||
IO.DynamicCombo.Input(
|
IO.DynamicCombo.Input(
|
||||||
"format",
|
"format",
|
||||||
options=[
|
options=[
|
||||||
IO.DynamicCombo.Option(
|
IO.DynamicCombo.Option(
|
||||||
"png",
|
"png",
|
||||||
[
|
[
|
||||||
IO.Combo.Input(
|
IO.Combo.Input(
|
||||||
"bit_depth",
|
"bit_depth",
|
||||||
@ -975,12 +981,6 @@ class SaveImageAdvanced(IO.ComfyNode):
|
|||||||
default="8-bit",
|
default="8-bit",
|
||||||
advanced=True,
|
advanced=True,
|
||||||
),
|
),
|
||||||
IO.Combo.Input(
|
|
||||||
"color_space",
|
|
||||||
options=["Raw/Data", "sRGB"],
|
|
||||||
default="sRGB",
|
|
||||||
advanced=True,
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
IO.DynamicCombo.Option(
|
IO.DynamicCombo.Option(
|
||||||
@ -992,12 +992,6 @@ class SaveImageAdvanced(IO.ComfyNode):
|
|||||||
default="8-bit",
|
default="8-bit",
|
||||||
advanced=True,
|
advanced=True,
|
||||||
),
|
),
|
||||||
IO.Combo.Input(
|
|
||||||
"color_space",
|
|
||||||
options=["sRGB"],
|
|
||||||
default="sRGB",
|
|
||||||
advanced=True,
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
IO.DynamicCombo.Option(
|
IO.DynamicCombo.Option(
|
||||||
@ -1005,14 +999,8 @@ class SaveImageAdvanced(IO.ComfyNode):
|
|||||||
[
|
[
|
||||||
IO.Combo.Input(
|
IO.Combo.Input(
|
||||||
"bit_depth",
|
"bit_depth",
|
||||||
options=["16-bit (half-float)", "32-bit"],
|
options=["16-bit", "32-bit"],
|
||||||
default="16-bit (half-float)",
|
default="16-bit",
|
||||||
advanced=True,
|
|
||||||
),
|
|
||||||
IO.Combo.Input(
|
|
||||||
"color_space",
|
|
||||||
options=["Linear", "Raw/Data"],
|
|
||||||
default="Linear",
|
|
||||||
advanced=True,
|
advanced=True,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@ -1027,22 +1015,15 @@ class SaveImageAdvanced(IO.ComfyNode):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def execute(
|
def execute(cls, images, filename_prefix: str, format: dict, embed_workflow: bool, prompt=None, extra_pnginfo=None) -> IO.NodeOutput:
|
||||||
cls,
|
|
||||||
images: Input.Image,
|
|
||||||
filename_prefix: str,
|
|
||||||
format: dict,
|
|
||||||
embed_workflow: bool,
|
|
||||||
prompt=None,
|
|
||||||
extra_pnginfo=None
|
|
||||||
) -> IO.NodeOutput:
|
|
||||||
output_dir = folder_paths.get_output_directory()
|
output_dir = folder_paths.get_output_directory()
|
||||||
full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, output_dir, images[0].shape[1], images[0].shape[0])
|
full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.\
|
||||||
|
get_save_image_path(filename_prefix, output_dir, images[0].shape[1], images[0].shape[0])
|
||||||
results = list()
|
results = list()
|
||||||
|
|
||||||
for batch_number, image in enumerate(images):
|
for batch_number, image in enumerate(images):
|
||||||
# get widget values from dynamic combo
|
# get widget values from dynamic combo
|
||||||
extension = format["format"]
|
file_format = format["format"]
|
||||||
bit_depth = format["bit_depth"]
|
bit_depth = format["bit_depth"]
|
||||||
color_space = format["color_space"]
|
color_space = format["color_space"]
|
||||||
|
|
||||||
@ -1059,12 +1040,6 @@ class SaveImageAdvanced(IO.ComfyNode):
|
|||||||
|
|
||||||
if file_format in ["png", "exr", "avif"]:
|
if file_format in ["png", "exr", "avif"]:
|
||||||
|
|
||||||
# safe bit downcasting
|
|
||||||
if (file_format == "png" or file_format == "avif") and bit_depth == "32-bit":
|
|
||||||
bit_depth = "16-bit"
|
|
||||||
if file_format == "exr" and bit_depth == "8-bit":
|
|
||||||
bit_depth = "16-bit"
|
|
||||||
|
|
||||||
if bit_depth == "32-bit":
|
if bit_depth == "32-bit":
|
||||||
img_np = img_tensor.cpu().numpy().astype(np.float32)
|
img_np = img_tensor.cpu().numpy().astype(np.float32)
|
||||||
av_fmt = 'gbrapf32le' if has_alpha else 'gbrpf32le'
|
av_fmt = 'gbrapf32le' if has_alpha else 'gbrpf32le'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user