[nodes] Formatting and small fixes

meshroom/nodes/aliceVision/CameraInit.py

@@ -63,6 +63,13 @@ class CameraInit(desc.CommandLineNode):
             description="Camera Intrinsics",
             group="",
         ),
+        desc.File(
+            name='sensorDatabase',
+            label='Sensor Database',
+            description='''Camera sensor width database path.''',
+            value=os.environ.get('ALICEVISION_SENSOR_DB', ''),
+            uid=[],
+        ),
         desc.FloatParam(
             name='defaultFieldOfView',
             label='Default Field Of View',
@@ -71,13 +78,6 @@ class CameraInit(desc.CommandLineNode):
             range=(0, 180.0, 1),
             uid=[0],
         ),
-        desc.File(
-            name='sensorDatabase',
-            label='Sensor Database',
-            description='''Camera sensor width database path.''',
-            value=os.environ.get('ALICEVISION_SENSOR_DB', ''),
-            uid=[],
-        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',
@@ -92,7 +92,7 @@ class CameraInit(desc.CommandLineNode):
     outputs = [
         desc.File(
             name='output',
-            label='Output',
+            label='Output SfMData File',
             description='''Output SfMData.''',
             value='{cache}/{nodeType}/{uid0}/cameraInit.sfm',
             uid=[],

meshroom/nodes/aliceVision/CameraLocalization.py

@@ -212,10 +212,10 @@ class CameraLocalization(desc.CommandLineNode):
             uid=[],
             ),
         desc.File(
-            name='outputBinary',
-            label='Output Binary',
-            description='''Filename for the localization results (raw data) as .bin''',
-            value='{cache}/{nodeType}/{uid0}/trackedCameras.bin',
+            name='outputJSON',
+            label='Output JSON',
+            description='''Filename for the localization results as .json''',
+            value='{cache}/{nodeType}/{uid0}/trackedCameras.json',
             uid=[],
             ),
     ]

meshroom/nodes/aliceVision/ConvertAnimatedCamera.py

@@ -20,7 +20,7 @@ class ConvertAnimatedCamera(desc.CommandLineNode):
         desc.File(
             name='output',
             label='Output',
-            description='''Path to the output Alembic file.''',
+            description='Path to the output Alembic file.',
             value='{cache}/{nodeType}/{uid0}/animatedCamera.abc',
             uid=[],
             ),

meshroom/nodes/aliceVision/ConvertSfMFormat.py

@@ -10,16 +10,16 @@ class ConvertSfMFormat(desc.CommandLineNode):
         desc.File(
             name='input',
             label='Input',
-            description='''SfMData file.''',
+            description='SfMData file.',
             value='',
             uid=[0],
         ),
         desc.ChoiceParam(
             name='fileExt',
             label='SfM File Format',
-            description='''SfM File Format''',
+            description='SfM File Format',
             value='abc',
-            values=['abc', 'sfm', 'ply', 'bin', 'json'],
+            values=['abc', 'sfm', 'json', 'ply', 'baf'],
             exclusive=True,
             uid=[0],
             group='',  # exclude from command line
@@ -27,42 +27,42 @@ class ConvertSfMFormat(desc.CommandLineNode):
         desc.BoolParam(
             name='views',
             label='Views',
-            description='''Export views.''',
+            description='Export views.',
             value=True,
             uid=[0],
         ),
         desc.BoolParam(
             name='intrinsics',
             label='Intrinsics',
-            description='''Export intrinsics.''',
+            description='Export intrinsics.',
             value=True,
             uid=[0],
         ),
         desc.BoolParam(
             name='extrinsics',
             label='Extrinsics',
-            description='''Export extrinsics.''',
+            description='Export extrinsics.',
             value=True,
             uid=[0],
         ),
         desc.BoolParam(
             name='structure',
             label='Structure',
-            description='''Export structure.''',
+            description='Export structure.',
             value=True,
             uid=[0],
         ),
         desc.BoolParam(
             name='observations',
             label='Observations',
-            description='''Export observations.''',
+            description='Export observations.',
             value=True,
             uid=[0],
         ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',
-            description='''verbosity level (fatal, error, warning, info, debug, trace).''',
+            description='verbosity level (fatal, error, warning, info, debug, trace).',
             value='info',
             values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
             exclusive=True,
@@ -74,7 +74,7 @@ class ConvertSfMFormat(desc.CommandLineNode):
         desc.File(
             name='output',
             label='Output',
-            description='''Path to the output SfM Data file.''',
+            description='Path to the output SfM Data file.',
             value='{cache}/{nodeType}/{uid0}/sfm.{fileExtValue}',
             uid=[],
             ),

meshroom/nodes/aliceVision/FeatureExtraction.py

@@ -13,7 +13,7 @@ class FeatureExtraction(desc.CommandLineNode):
         desc.File(
             name='input',
             label='Input',
-            description='''SfMData file.''',
+            description='SfMData file.',
             value='',
             uid=[0],
         ),
@@ -39,14 +39,14 @@ class FeatureExtraction(desc.CommandLineNode):
         desc.BoolParam(
             name='forceCpuExtraction',
             label='Force CPU Extraction',
-            description='''Use only CPU feature extraction.''',
+            description='Use only CPU feature extraction.',
             value=True,
             uid=[],
         ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',
-            description='''verbosity level (fatal, error, warning, info, debug, trace).''',
+            description='verbosity level (fatal, error, warning, info, debug, trace).',
             value='info',
             values=['fatal', 'error', 'warning', 'info', 'debug', 'trace'],
             exclusive=True,
@@ -57,8 +57,8 @@ class FeatureExtraction(desc.CommandLineNode):
     outputs = [
         desc.File(
             name='output',
-            label='Output',
-            description='''Output path for the features and descriptors files (*.feat, *.desc).''',
+            label='Output Folder',
+            description='Output path for the features and descriptors files (*.feat, *.desc).',
             value='{cache}/{nodeType}/{uid0}/',
             uid=[],
         ),

meshroom/nodes/aliceVision/FeatureMatching.py

@@ -64,7 +64,7 @@ class FeatureMatching(desc.CommandLineNode):
         desc.ChoiceParam(
             name='geometricEstimator',
             label='Geometric Estimator',
-            description='''Geometric estimator: * acransac: A-Contrario Ransac * loransac: LO-Ransac (only available for fundamental matrix)''',
+            description='Geometric estimator: (acransac: A-Contrario Ransac, loransac: LO-Ransac (only available for "fundamental_matrix" model)',
             value='acransac',
             values=['acransac', 'loransac'],
             exclusive=True,
@@ -81,12 +81,13 @@ class FeatureMatching(desc.CommandLineNode):
             value=['fundamental_matrix'],
             values=['fundamental_matrix', 'essential_matrix', 'homography_matrix', 'homography_growing'],
             exclusive=False,
-            uid=[0]
+            uid=[0],
+            joinChar=',',
         ),
         desc.FloatParam(
             name='distanceRatio',
             label='Distance Ratio',
-            description='''Distance ratio to discard non meaningful matches.''',
+            description='Distance ratio to discard non meaningful matches.',
             value=0.8,
             range=(0.0, 1.0, 0.01),
             uid=[0],