Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/alicevision/meshroom.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Vital <mugulmotion@gmail.com>2022-09-28 18:29:32 +0300
committerFabien Castan <fabcastan@gmail.com>2022-10-19 11:50:17 +0300
commita94be6c6a0bd7b18cee3f641be51cad5bc5a638f (patch)
tree2ac8cbbc1108780cc928b6c157f84067b415a5c5
parenta36abd99a6498ea47bab1744d3a4e221b9133f2d (diff)
[nodes] update desc for nodes in panoramaHDR pipeline to visualize their output
-rw-r--r--meshroom/nodes/aliceVision/ImageProcessing.py3
-rw-r--r--meshroom/nodes/aliceVision/PanoramaMerging.py1
-rw-r--r--meshroom/nodes/aliceVision/PanoramaWarping.py9
-rw-r--r--meshroom/ui/qml/Viewer/Viewer2D.qml4
4 files changed, 15 insertions, 2 deletions
diff --git a/meshroom/nodes/aliceVision/ImageProcessing.py b/meshroom/nodes/aliceVision/ImageProcessing.py
index e276c365..f45361a2 100644
--- a/meshroom/nodes/aliceVision/ImageProcessing.py
+++ b/meshroom/nodes/aliceVision/ImageProcessing.py
@@ -12,7 +12,7 @@ def outputImagesValueFunct(attr):
if inputExt in ['.abc', '.sfm']:
# If we have an SfM in input
- return desc.Node.internalFolder + '*' + (outputExt or '.*')
+ return desc.Node.internalFolder + '<VIEW_ID>' + (outputExt or '.*')
if inputExt:
# if we have one or multiple files in input
@@ -342,6 +342,7 @@ Convert or apply filtering to the input images.
name='outputImages',
label='Output Images',
description='Output Image Files.',
+ semantic='image',
value= outputImagesValueFunct,
group='', # do not export on the command line
uid=[],
diff --git a/meshroom/nodes/aliceVision/PanoramaMerging.py b/meshroom/nodes/aliceVision/PanoramaMerging.py
index 99a14ec7..bfe45805 100644
--- a/meshroom/nodes/aliceVision/PanoramaMerging.py
+++ b/meshroom/nodes/aliceVision/PanoramaMerging.py
@@ -71,6 +71,7 @@ Merge all inputs coming from the PanoramaCompositing node.
name='outputPanorama',
label='Output Folder',
description='',
+ semantic='image',
value=desc.Node.internalFolder + 'panorama.{outputFileTypeValue}',
uid=[],
),
diff --git a/meshroom/nodes/aliceVision/PanoramaWarping.py b/meshroom/nodes/aliceVision/PanoramaWarping.py
index 33d3e0a9..507ad476 100644
--- a/meshroom/nodes/aliceVision/PanoramaWarping.py
+++ b/meshroom/nodes/aliceVision/PanoramaWarping.py
@@ -97,4 +97,13 @@ Compute the image warping for each input image in the panorama coordinate system
value=desc.Node.internalFolder,
uid=[],
),
+ desc.File(
+ name='warping',
+ label='Image Warping',
+ description='',
+ group='', # do not export on the command line
+ semantic='image',
+ value=desc.Node.internalFolder+'<VIEW_ID>.exr',
+ uid=[]
+ ),
]
diff --git a/meshroom/ui/qml/Viewer/Viewer2D.qml b/meshroom/ui/qml/Viewer/Viewer2D.qml
index ada1061a..dd82aecf 100644
--- a/meshroom/ui/qml/Viewer/Viewer2D.qml
+++ b/meshroom/ui/qml/Viewer/Viewer2D.qml
@@ -197,7 +197,9 @@ FocusScope {
for (var i = 0; i < node.attributes.count; i++) {
var attr = node.attributes.at(i);
if (attr.name == attrName) {
- return Filepath.stringToUrl(String(attr.value).replace("<VIEW_ID>", viewId));
+ let pattern = String(attr.value).replace("<VIEW_ID>", viewId);
+ let path = Filepath.globFirst(pattern);
+ return Filepath.stringToUrl(path);
}
}
return "";