Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nodes] Replace desc.Node.internalFolder with {nodeCacheFolder} #12

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meshroom/nodes/imageSegmentation/ImageDetectionPrompt.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
value=lambda attr: "{nodeCacheFolder}/" + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
enabled=lambda node: node.outputBboxImage.value,
group="",
),
Expand Down
4 changes: 2 additions & 2 deletions meshroom/nodes/imageSegmentation/ImageSegmentationBox.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
value=lambda attr: "{nodeCacheFolder}/" + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
group="",
),
]
Expand Down
6 changes: 3 additions & 3 deletions meshroom/nodes/imageSegmentation/ImageSegmentationPrompt.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,22 +136,22 @@ 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 + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
value=lambda attr: "{nodeCacheFolder}/" + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
group="",
),
desc.File(
name="bboxes",
label="BBoxes",
description="Generated images with bounded boxes baked in.",
semantic="image",
value=lambda attr: desc.Node.internalFolder + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "_bboxes.jpg",
value=lambda attr: "{nodeCacheFolder}/" + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "_bboxes.jpg",
enabled=lambda node: node.outputBboxImage.value,
group="",
),
Expand Down
4 changes: 2 additions & 2 deletions meshroom/nodes/imageSegmentation/ImageTagsExtraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
value=lambda attr: "{nodeCacheFolder}/" + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
group="",
),
]
Expand Down
4 changes: 2 additions & 2 deletions meshroom/nodes/imageSegmentation/SegmentAnything.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
value=lambda attr: "{nodeCacheFolder}/" + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
group="",
),
]
Expand Down
4 changes: 2 additions & 2 deletions meshroom/nodes/imageSegmentation/TagsExtraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
value=lambda attr: "{nodeCacheFolder}/" + ("<FILESTEM>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
group="",
),
]
Expand Down