From 56759678a89037a831920c80f268db1be69754e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Wed, 8 Jan 2025 20:11:56 +0100 Subject: [PATCH] [nodes] Replace `desc.Node.internalFolder` with `{nodeCacheFolder}` --- meshroom/nodes/imageSegmentation/ImageDetectionPrompt.py | 4 ++-- meshroom/nodes/imageSegmentation/ImageSegmentationBox.py | 4 ++-- meshroom/nodes/imageSegmentation/ImageSegmentationPrompt.py | 6 +++--- meshroom/nodes/imageSegmentation/ImageTagsExtraction.py | 4 ++-- meshroom/nodes/imageSegmentation/SegmentAnything.py | 4 ++-- meshroom/nodes/imageSegmentation/TagsExtraction.py | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meshroom/nodes/imageSegmentation/ImageDetectionPrompt.py b/meshroom/nodes/imageSegmentation/ImageDetectionPrompt.py index ba074c8..1149477 100644 --- a/meshroom/nodes/imageSegmentation/ImageDetectionPrompt.py +++ b/meshroom/nodes/imageSegmentation/ImageDetectionPrompt.py @@ -124,14 +124,14 @@ class ImageDetectionPrompt(desc.Node): name="output", label="BBox Folder", description="Output path for the bounded boxes.", - value=desc.Node.internalFolder, + value="{nodeCacheFolder}", ), desc.File( name="bboxes", label="BBoxes", description="Generated images with bounded boxes baked in.", semantic="image", - value=lambda attr: desc.Node.internalFolder + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, + value=lambda attr: "{nodeCacheFolder}/" + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, enabled=lambda node: node.outputBboxImage.value, group="", ), diff --git a/meshroom/nodes/imageSegmentation/ImageSegmentationBox.py b/meshroom/nodes/imageSegmentation/ImageSegmentationBox.py index 6f8a321..a9b7473 100644 --- a/meshroom/nodes/imageSegmentation/ImageSegmentationBox.py +++ b/meshroom/nodes/imageSegmentation/ImageSegmentationBox.py @@ -80,14 +80,14 @@ class ImageSegmentationBox(desc.Node): name="output", label="Masks Folder", description="Output path for the masks.", - value=desc.Node.internalFolder, + value="{nodeCacheFolder}", ), desc.File( name="masks", label="Masks", description="Generated segmentation masks.", semantic="image", - value=lambda attr: desc.Node.internalFolder + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, + value=lambda attr: "{nodeCacheFolder}/" + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, group="", ), ] diff --git a/meshroom/nodes/imageSegmentation/ImageSegmentationPrompt.py b/meshroom/nodes/imageSegmentation/ImageSegmentationPrompt.py index ddefc21..7aeca10 100644 --- a/meshroom/nodes/imageSegmentation/ImageSegmentationPrompt.py +++ b/meshroom/nodes/imageSegmentation/ImageSegmentationPrompt.py @@ -136,14 +136,14 @@ class ImageSegmentationPrompt(desc.Node): name="output", label="Masks Folder", description="Output path for the masks.", - value=desc.Node.internalFolder, + value="{nodeCacheFolder}", ), desc.File( name="masks", label="Masks", description="Generated segmentation masks.", semantic="image", - value=lambda attr: desc.Node.internalFolder + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, + value=lambda attr: "{nodeCacheFolder}/" + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, group="", ), desc.File( @@ -151,7 +151,7 @@ class ImageSegmentationPrompt(desc.Node): label="BBoxes", description="Generated images with bounded boxes baked in.", semantic="image", - value=lambda attr: desc.Node.internalFolder + ("" if attr.node.keepFilename.value else "") + "_bboxes.jpg", + value=lambda attr: "{nodeCacheFolder}/" + ("" if attr.node.keepFilename.value else "") + "_bboxes.jpg", enabled=lambda node: node.outputBboxImage.value, group="", ), diff --git a/meshroom/nodes/imageSegmentation/ImageTagsExtraction.py b/meshroom/nodes/imageSegmentation/ImageTagsExtraction.py index 6d6a1bb..a1d9aed 100644 --- a/meshroom/nodes/imageSegmentation/ImageTagsExtraction.py +++ b/meshroom/nodes/imageSegmentation/ImageTagsExtraction.py @@ -73,14 +73,14 @@ class ImageTagsExtraction(desc.Node): name="output", label="Result Folder", description="Output path for the resulting images.", - value=desc.Node.internalFolder, + value="{nodeCacheFolder}", ), desc.File( name="results", label="Results", description="Generated images.", semantic="image", - value=lambda attr: desc.Node.internalFolder + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, + value=lambda attr: "{nodeCacheFolder}/" + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, group="", ), ] diff --git a/meshroom/nodes/imageSegmentation/SegmentAnything.py b/meshroom/nodes/imageSegmentation/SegmentAnything.py index 253f2d8..b473a98 100644 --- a/meshroom/nodes/imageSegmentation/SegmentAnything.py +++ b/meshroom/nodes/imageSegmentation/SegmentAnything.py @@ -80,14 +80,14 @@ class SegmentAnything(desc.Node): name="output", label="Masks Folder", description="Output path for the masks.", - value=desc.Node.internalFolder, + value="{nodeCacheFolder}", ), desc.File( name="masks", label="Masks", description="Generated segmentation masks.", semantic="image", - value=lambda attr: desc.Node.internalFolder + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, + value=lambda attr: "{nodeCacheFolder}/" + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, group="", ), ] diff --git a/meshroom/nodes/imageSegmentation/TagsExtraction.py b/meshroom/nodes/imageSegmentation/TagsExtraction.py index a9617ee..307e77c 100644 --- a/meshroom/nodes/imageSegmentation/TagsExtraction.py +++ b/meshroom/nodes/imageSegmentation/TagsExtraction.py @@ -74,14 +74,14 @@ class TagsExtraction(desc.Node): name="output", label="Result Folder", description="Output path for the resulting images.", - value=desc.Node.internalFolder, + value="{nodeCacheFolder}", ), desc.File( name="results", label="Results", description="Generated images.", semantic="image", - value=lambda attr: desc.Node.internalFolder + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, + value=lambda attr: "{nodeCacheFolder}/" + ("" if attr.node.keepFilename.value else "") + "." + attr.node.extension.value, group="", ), ]