From 95c8cf1ff420703b400bfe139b8ce5d7581671b5 Mon Sep 17 00:00:00 2001 From: Enguerrand DE SMET Date: Tue, 30 Jun 2020 17:41:16 +0200 Subject: [PATCH 1/3] [nodes] cameraInit: allowed intrinsics option --- meshroom/nodes/aliceVision/CameraInit.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index eff321e12a..71df627867 100644 --- a/meshroom/nodes/aliceVision/CameraInit.py +++ b/meshroom/nodes/aliceVision/CameraInit.py @@ -139,6 +139,17 @@ class CameraInit(desc.CommandLineNode): uid=[0], advanced=True ), + desc.ChoiceParam( + name='allowedCameraModels', + label='Allowed Camera Models', + description='the Camera Models that can be attributed.', + value=['pinhole', 'radial1', 'radial3', 'brown', 'fisheye4', 'fisheye1'], + values=['pinhole', 'radial1', 'radial3', 'brown', 'fisheye4', 'fisheye1'], + exclusive=False, + uid=[0], + joinChar=',', + advanced= True + ), desc.ChoiceParam( name='verboseLevel', label='Verbose Level', From 162a6804abf25b7c9adfbe5e4ca833dbcd187bf7 Mon Sep 17 00:00:00 2001 From: Enguerrand DE SMET Date: Tue, 30 Jun 2020 20:41:13 +0200 Subject: [PATCH 2/3] [nodes] camerainit: viewId from filename --- meshroom/nodes/aliceVision/CameraInit.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index 71df627867..b1b62c39c8 100644 --- a/meshroom/nodes/aliceVision/CameraInit.py +++ b/meshroom/nodes/aliceVision/CameraInit.py @@ -150,6 +150,29 @@ class CameraInit(desc.CommandLineNode): joinChar=',', advanced= True ), + desc.ChoiceParam( + name='viewIdMethod', + label='ViewId Method', + description="Allows to choose the way the viewID is generated:\n" + " * metadata : Generate viewId from image metadata.\n" + " * filename : Generate viewId from file names using regex.", + value='metadata', + values=['metadata', 'filename'], + exclusive=True, + uid=[0], + advanced= True + ), + desc.StringParam( + name='viewIdRegex', + label='ViewId Regex', + description='Regex used to catch number used as viewId in filename.' + 'You should capture specific parts of the filename with parenthesis to define matching elements. (only number will works)\n' + 'Some examples of patterns:\n' + ' - Match the longest number at the end of filename (default value): ".*?(\d+)"\n' + ' - Match the first number found in filename : "(\d+).*"\n', + value='.*?(\d+)', + uid=[0], + ), desc.ChoiceParam( name='verboseLevel', label='Verbose Level', From 253d9d569da1da4a3e24c26a3af0306d1b925109 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Tue, 30 Jun 2020 22:54:56 +0200 Subject: [PATCH 3/3] [nodes] CameraInit: view regex is an advanced param --- meshroom/nodes/aliceVision/CameraInit.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index b1b62c39c8..876bc850cc 100644 --- a/meshroom/nodes/aliceVision/CameraInit.py +++ b/meshroom/nodes/aliceVision/CameraInit.py @@ -137,7 +137,7 @@ class CameraInit(desc.CommandLineNode): value='folder', exclusive=True, uid=[0], - advanced=True + advanced=True, ), desc.ChoiceParam( name='allowedCameraModels', @@ -148,7 +148,7 @@ class CameraInit(desc.CommandLineNode): exclusive=False, uid=[0], joinChar=',', - advanced= True + advanced=True, ), desc.ChoiceParam( name='viewIdMethod', @@ -160,7 +160,7 @@ class CameraInit(desc.CommandLineNode): values=['metadata', 'filename'], exclusive=True, uid=[0], - advanced= True + advanced=True, ), desc.StringParam( name='viewIdRegex', @@ -172,6 +172,7 @@ class CameraInit(desc.CommandLineNode): ' - Match the first number found in filename : "(\d+).*"\n', value='.*?(\d+)', uid=[0], + advanced=True, ), desc.ChoiceParam( name='verboseLevel',