diff options
author | Loïc Vital <mugulmotion@gmail.com> | 2022-09-21 14:07:41 +0300 |
---|---|---|
committer | Fabien Castan <fabcastan@gmail.com> | 2022-10-19 11:50:08 +0300 |
commit | b4f0b5377e760a362be9719055a9ddb187682598 (patch) | |
tree | c3d235b9fa66596c61fb0275df473ee7d39d80c9 | |
parent | a574c0fc9b30d1d67ff6addc00afa55a6dade3cc (diff) |
added some comments
-rw-r--r-- | meshroom/nodes/aliceVision/DepthMap.py | 3 | ||||
-rw-r--r-- | meshroom/nodes/aliceVision/DepthMapFilter.py | 3 | ||||
-rw-r--r-- | meshroom/nodes/aliceVision/ImageProcessing.py | 17 | ||||
-rw-r--r-- | meshroom/nodes/aliceVision/Texturing.py | 11 | ||||
-rw-r--r-- | meshroom/ui/qml/Viewer/Viewer2D.qml | 2 |
5 files changed, 13 insertions, 23 deletions
diff --git a/meshroom/nodes/aliceVision/DepthMap.py b/meshroom/nodes/aliceVision/DepthMap.py index 53da77f0..d7ecc256 100644 --- a/meshroom/nodes/aliceVision/DepthMap.py +++ b/meshroom/nodes/aliceVision/DepthMap.py @@ -298,6 +298,9 @@ Use a downscale factor of one (full-resolution) only if the quality of the input value=desc.Node.internalFolder, uid=[], ), + # these attributes are only here to describe more accurately the output of the node + # by specifying that it generates 2 sequences of images + # (see in Viewer2D.qml how these attributes can be used) desc.File( name='depth', label='Depth Maps', diff --git a/meshroom/nodes/aliceVision/DepthMapFilter.py b/meshroom/nodes/aliceVision/DepthMapFilter.py index 5280c808..c52dd233 100644 --- a/meshroom/nodes/aliceVision/DepthMapFilter.py +++ b/meshroom/nodes/aliceVision/DepthMapFilter.py @@ -128,6 +128,9 @@ This allows to filter unstable points before starting the fusion of all depth ma value=desc.Node.internalFolder, uid=[], ), + # these attributes are only here to describe more accurately the output of the node + # by specifying that it generates 2 sequences of images + # (see in Viewer2D.qml how these attributes can be used) desc.File( name='depth', label='Depth Maps', diff --git a/meshroom/nodes/aliceVision/ImageProcessing.py b/meshroom/nodes/aliceVision/ImageProcessing.py index 652ef3b3..e276c365 100644 --- a/meshroom/nodes/aliceVision/ImageProcessing.py +++ b/meshroom/nodes/aliceVision/ImageProcessing.py @@ -338,21 +338,12 @@ Convert or apply filtering to the input images. value=desc.Node.internalFolder, uid=[], ), - #desc.File( - # name='outputImages', - # label='Output Images', - # description='Output Image Files.', - # value= outputImagesValueFunct, - # group='', # do not export on the command line - # uid=[], - #), desc.File( name='outputImages', label='Output Images', description='Output Image Files.', - semantic='image', - value=desc.Node.internalFolder + '<VIEW_ID>.exr', - group='', # do not export on the command line - uid=[] - ) + value= outputImagesValueFunct, + group='', # do not export on the command line + uid=[], + ), ] diff --git a/meshroom/nodes/aliceVision/Texturing.py b/meshroom/nodes/aliceVision/Texturing.py index 1f1c9bba..83d46d90 100644 --- a/meshroom/nodes/aliceVision/Texturing.py +++ b/meshroom/nodes/aliceVision/Texturing.py @@ -342,20 +342,11 @@ Many cameras are contributing to the low frequencies and only the best ones cont uid=[], group='', ), - #desc.File( - # name='outputTextures', - # label='Textures', - # description='Output Texture files.', - # value= lambda attr: desc.Node.internalFolder + 'texture_*.' + attr.node.colorMapping.colorMappingFileType.value if attr.node.colorMapping.enable.value else '', - # uid=[], - # group='', - # ), desc.File( name='outputTextures', label='Textures', description='Output Texture files.', - semantic='image', - value=desc.Node.internalFolder+'texture_*.exr', + value= lambda attr: desc.Node.internalFolder + 'texture_*.' + attr.node.colorMapping.colorMappingFileType.value if attr.node.colorMapping.enable.value else '', uid=[], group='' ) diff --git a/meshroom/ui/qml/Viewer/Viewer2D.qml b/meshroom/ui/qml/Viewer/Viewer2D.qml index c181ae73..f7d14d8c 100644 --- a/meshroom/ui/qml/Viewer/Viewer2D.qml +++ b/meshroom/ui/qml/Viewer/Viewer2D.qml @@ -155,6 +155,8 @@ FocusScope { } function getImageFile() { + // entry point for getting the image file URL that corresponds to + // the displayed node, selected output attribute and selected viewId if (outputAttribute.name == "") { return getViewpointPath(_reconstruction.selectedViewId); } |