diff --git a/meshroom/nodes/aliceVision/ApplyCalibration.py b/meshroom/nodes/aliceVision/ApplyCalibration.py index e50ee483..79b59aa2 100644 --- a/meshroom/nodes/aliceVision/ApplyCalibration.py +++ b/meshroom/nodes/aliceVision/ApplyCalibration.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ApplyCalibration(desc.AVCommandLineNode): commandLine = 'aliceVision_applyCalibration {allParams}' @@ -30,8 +31,8 @@ Overwrite intrinsics with a calibrated intrinsic. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/CameraCalibration.py b/meshroom/nodes/aliceVision/CameraCalibration.py index 38af3adb..ccfa01e6 100644 --- a/meshroom/nodes/aliceVision/CameraCalibration.py +++ b/meshroom/nodes/aliceVision/CameraCalibration.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class CameraCalibration(desc.AVCommandLineNode): @@ -127,8 +128,8 @@ class CameraCalibration(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/CameraInit.py b/meshroom/nodes/aliceVision/CameraInit.py index d078f2fb..965e4aae 100644 --- a/meshroom/nodes/aliceVision/CameraInit.py +++ b/meshroom/nodes/aliceVision/CameraInit.py @@ -8,6 +8,7 @@ import tempfile import logging from meshroom.core import desc, Version +from meshroom.core.utils import RAW_COLOR_INTERPRETATION, VERBOSE_LEVEL from meshroom.multiview import FilesByType, findFilesByTypeInFolder Viewpoint = [ @@ -260,8 +261,8 @@ The needed metadata are: " - LibRawWhiteBalancing: Use internal white balancing from libraw.\n" " - DCPLinearProcessing: Use DCP color profile.\n" " - DCPMetadata: Same as None with DCP info added in metadata.", + values=RAW_COLOR_INTERPRETATION, value="DCPLinearProcessing" if os.environ.get("ALICEVISION_COLOR_PROFILE_DB", "") else "LibRawWhiteBalancing", - values=["None", "LibRawNoWhiteBalancing", "LibRawWhiteBalancing", "DCPLinearProcessing", "DCPMetadata"], exclusive=True, uid=[0], ), @@ -313,8 +314,8 @@ The needed metadata are: name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/CameraLocalization.py b/meshroom/nodes/aliceVision/CameraLocalization.py index ab65c4f4..29a9cc8a 100644 --- a/meshroom/nodes/aliceVision/CameraLocalization.py +++ b/meshroom/nodes/aliceVision/CameraLocalization.py @@ -2,6 +2,7 @@ __version__ = "1.0" import os from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class CameraLocalization(desc.AVCommandLineNode): @@ -44,8 +45,8 @@ class CameraLocalization(desc.AVCommandLineNode): name="matchDescTypes", label="Match Desc Types", description="Describer types to use for the matching.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -210,8 +211,8 @@ class CameraLocalization(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/CameraRigCalibration.py b/meshroom/nodes/aliceVision/CameraRigCalibration.py index 54784dd4..ac0f42b7 100644 --- a/meshroom/nodes/aliceVision/CameraRigCalibration.py +++ b/meshroom/nodes/aliceVision/CameraRigCalibration.py @@ -2,6 +2,7 @@ __version__ = "1.0" import os from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class CameraRigCalibration(desc.AVCommandLineNode): @@ -52,8 +53,8 @@ class CameraRigCalibration(desc.AVCommandLineNode): name="matchDescTypes", label="Match Describer Types", description="The describer types to use for the matching.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -169,8 +170,8 @@ class CameraRigCalibration(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/CameraRigLocalization.py b/meshroom/nodes/aliceVision/CameraRigLocalization.py index e175c0c9..2c4fc0c1 100644 --- a/meshroom/nodes/aliceVision/CameraRigLocalization.py +++ b/meshroom/nodes/aliceVision/CameraRigLocalization.py @@ -2,6 +2,7 @@ __version__ = "1.0" import os from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class CameraRigLocalization(desc.AVCommandLineNode): @@ -51,8 +52,8 @@ class CameraRigLocalization(desc.AVCommandLineNode): name="matchDescTypes", label="Match Describer Types", description="The describer types to use for the matching.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -176,8 +177,8 @@ class CameraRigLocalization(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/CheckerboardCalibration.py b/meshroom/nodes/aliceVision/CheckerboardCalibration.py index 0e5ab339..be347c81 100644 --- a/meshroom/nodes/aliceVision/CheckerboardCalibration.py +++ b/meshroom/nodes/aliceVision/CheckerboardCalibration.py @@ -1,6 +1,7 @@ __version__ = '1.0' from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class CheckerboardCalibration(desc.AVCommandLineNode): @@ -39,8 +40,8 @@ Estimate the camera intrinsics and extrinsincs on a set of checkerboard images. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/CheckerboardDetection.py b/meshroom/nodes/aliceVision/CheckerboardDetection.py index 4e2bb4c9..94b1aed5 100644 --- a/meshroom/nodes/aliceVision/CheckerboardDetection.py +++ b/meshroom/nodes/aliceVision/CheckerboardDetection.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class CheckerboardDetection(desc.AVCommandLineNode): @@ -44,6 +45,15 @@ The detection method also supports nested calibration grids. value=False, uid=[0], ), + desc.ChoiceParam( + name="verboseLevel", + label="Verbose Level", + description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, + value="info", + exclusive=True, + uid=[], + ), ] outputs = [ diff --git a/meshroom/nodes/aliceVision/ColorCheckerCorrection.py b/meshroom/nodes/aliceVision/ColorCheckerCorrection.py index 5f53bae5..cb493aa8 100644 --- a/meshroom/nodes/aliceVision/ColorCheckerCorrection.py +++ b/meshroom/nodes/aliceVision/ColorCheckerCorrection.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import EXR_STORAGE_DATA_TYPE, VERBOSE_LEVEL import os.path @@ -54,8 +55,8 @@ If multiple color charts are submitted, only the first one will be taken in acco " - half: Use half float (16 bits per channel).\n" " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n" " - auto: Use half float if all values can fit, else use full float.", + values=EXR_STORAGE_DATA_TYPE, value="float", - values=["float", "half", "halfFinite", "auto"], exclusive=True, uid=[0], ), @@ -63,8 +64,8 @@ If multiple color charts are submitted, only the first one will be taken in acco name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/ColorCheckerDetection.py b/meshroom/nodes/aliceVision/ColorCheckerDetection.py index d5237973..28b9170c 100644 --- a/meshroom/nodes/aliceVision/ColorCheckerDetection.py +++ b/meshroom/nodes/aliceVision/ColorCheckerDetection.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL import os.path @@ -55,8 +56,8 @@ Dev notes: name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/ConvertMesh.py b/meshroom/nodes/aliceVision/ConvertMesh.py index e3ef5e7a..03d4e98c 100644 --- a/meshroom/nodes/aliceVision/ConvertMesh.py +++ b/meshroom/nodes/aliceVision/ConvertMesh.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ConvertMesh(desc.AVCommandLineNode): @@ -31,8 +32,8 @@ class ConvertMesh(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/ConvertSfMFormat.py b/meshroom/nodes/aliceVision/ConvertSfMFormat.py index 7b50a046..dc77bb4e 100644 --- a/meshroom/nodes/aliceVision/ConvertSfMFormat.py +++ b/meshroom/nodes/aliceVision/ConvertSfMFormat.py @@ -1,6 +1,7 @@ __version__ = "2.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class ConvertSfMFormat(desc.AVCommandLineNode): @@ -35,8 +36,8 @@ It can also be used to remove specific parts of from an SfM scene (like filter a name="describerTypes", label="Describer Types", description="Describer types to keep.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5", "unknown"], exclusive=False, uid=[0], joinChar=",", @@ -92,8 +93,8 @@ It can also be used to remove specific parts of from an SfM scene (like filter a name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/DepthMap.py b/meshroom/nodes/aliceVision/DepthMap.py index d418be8c..a27fa868 100644 --- a/meshroom/nodes/aliceVision/DepthMap.py +++ b/meshroom/nodes/aliceVision/DepthMap.py @@ -1,6 +1,7 @@ __version__ = "5.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class DepthMap(desc.AVCommandLineNode): @@ -594,8 +595,8 @@ Use a downscale factor of one (full-resolution) only if the quality of the input name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/DepthMapFilter.py b/meshroom/nodes/aliceVision/DepthMapFilter.py index 55e8ae85..80358038 100644 --- a/meshroom/nodes/aliceVision/DepthMapFilter.py +++ b/meshroom/nodes/aliceVision/DepthMapFilter.py @@ -1,6 +1,7 @@ __version__ = "4.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class DepthMapFilter(desc.AVCommandLineNode): @@ -113,8 +114,8 @@ This allows to filter unstable points before starting the fusion of all depth ma name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/DistortionCalibration.py b/meshroom/nodes/aliceVision/DistortionCalibration.py index 1ac9c84c..8e70280a 100644 --- a/meshroom/nodes/aliceVision/DistortionCalibration.py +++ b/meshroom/nodes/aliceVision/DistortionCalibration.py @@ -1,6 +1,7 @@ __version__ = '3.0' from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class DistortionCalibration(desc.AVCommandLineNode): @@ -40,8 +41,8 @@ Calibration of a camera/lens couple distortion using a full screen checkerboard. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/ExportAnimatedCamera.py b/meshroom/nodes/aliceVision/ExportAnimatedCamera.py index fe4b650a..a2681e7d 100644 --- a/meshroom/nodes/aliceVision/ExportAnimatedCamera.py +++ b/meshroom/nodes/aliceVision/ExportAnimatedCamera.py @@ -1,6 +1,7 @@ __version__ = "2.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ExportAnimatedCamera(desc.AVCommandLineNode): @@ -80,8 +81,8 @@ Based on the input image filenames, it will recognize the input video sequence t name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/ExportColoredPointCloud.py b/meshroom/nodes/aliceVision/ExportColoredPointCloud.py index dee37d94..ae39f79d 100644 --- a/meshroom/nodes/aliceVision/ExportColoredPointCloud.py +++ b/meshroom/nodes/aliceVision/ExportColoredPointCloud.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ExportColoredPointCloud(desc.AVCommandLineNode): @@ -22,8 +23,8 @@ class ExportColoredPointCloud(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/ExportDistortion.py b/meshroom/nodes/aliceVision/ExportDistortion.py index 3e7cbeae..9368e531 100644 --- a/meshroom/nodes/aliceVision/ExportDistortion.py +++ b/meshroom/nodes/aliceVision/ExportDistortion.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ExportDistortion(desc.AVCommandLineNode): commandLine = 'aliceVision_exportDistortion {allParams}' @@ -41,6 +42,15 @@ It also allows to export an undistorted image of the lens grids for validation. value=True, uid=[0], ), + desc.ChoiceParam( + name="verboseLevel", + label="Verbose Level", + description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, + value="info", + exclusive=True, + uid=[], + ), ] outputs = [ diff --git a/meshroom/nodes/aliceVision/ExportMatches.py b/meshroom/nodes/aliceVision/ExportMatches.py index ec189d16..d547df21 100644 --- a/meshroom/nodes/aliceVision/ExportMatches.py +++ b/meshroom/nodes/aliceVision/ExportMatches.py @@ -1,6 +1,7 @@ __version__ = "1.1" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class ExportMatches(desc.AVCommandLineNode): @@ -23,8 +24,8 @@ class ExportMatches(desc.AVCommandLineNode): name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -57,8 +58,8 @@ class ExportMatches(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/ExportMaya.py b/meshroom/nodes/aliceVision/ExportMaya.py index 253144a2..d28b7a23 100644 --- a/meshroom/nodes/aliceVision/ExportMaya.py +++ b/meshroom/nodes/aliceVision/ExportMaya.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ExportMaya(desc.AVCommandLineNode): @@ -26,8 +27,8 @@ MeshroomMaya contains a user interface to browse all cameras. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/FeatureExtraction.py b/meshroom/nodes/aliceVision/FeatureExtraction.py index 2dc13260..7118763d 100644 --- a/meshroom/nodes/aliceVision/FeatureExtraction.py +++ b/meshroom/nodes/aliceVision/FeatureExtraction.py @@ -1,7 +1,7 @@ __version__ = "1.3" from meshroom.core import desc -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, DESCRIBER_TYPES, VERBOSE_LEVEL class FeatureExtraction(desc.AVCommandLineNode): @@ -66,8 +66,8 @@ It is robust to motion-blur, depth-of-field, occlusion. Be careful to have enoug name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], exclusive=False, uid=[0], joinChar=",", @@ -167,8 +167,8 @@ It is robust to motion-blur, depth-of-field, occlusion. Be careful to have enoug name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/FeatureMatching.py b/meshroom/nodes/aliceVision/FeatureMatching.py index bbcab8bc..c48448b5 100644 --- a/meshroom/nodes/aliceVision/FeatureMatching.py +++ b/meshroom/nodes/aliceVision/FeatureMatching.py @@ -1,6 +1,7 @@ __version__ = "2.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class FeatureMatching(desc.AVCommandLineNode): @@ -63,8 +64,8 @@ then it checks the number of features that validates this model and iterate thro name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], exclusive=False, uid=[0], joinChar=",", @@ -213,8 +214,8 @@ then it checks the number of features that validates this model and iterate thro name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/FeatureRepeatability.py b/meshroom/nodes/aliceVision/FeatureRepeatability.py index bfb20616..d4dcabeb 100644 --- a/meshroom/nodes/aliceVision/FeatureRepeatability.py +++ b/meshroom/nodes/aliceVision/FeatureRepeatability.py @@ -1,6 +1,7 @@ __version__ = "1.1" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class FeatureRepeatability(desc.AVCommandLineNode): @@ -26,8 +27,8 @@ Compare feature/descriptor matching repeatability on some dataset with known hom name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["sift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -115,8 +116,8 @@ Compare feature/descriptor matching repeatability on some dataset with known hom name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/GlobalSfM.py b/meshroom/nodes/aliceVision/GlobalSfM.py index de7e5cfe..9a5e3a3c 100644 --- a/meshroom/nodes/aliceVision/GlobalSfM.py +++ b/meshroom/nodes/aliceVision/GlobalSfM.py @@ -4,6 +4,7 @@ import json import os from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class GlobalSfM(desc.AVCommandLineNode): @@ -52,9 +53,8 @@ It is known to be faster but less robust to challenging datasets than the Increm name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", - "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -95,8 +95,8 @@ It is known to be faster but less robust to challenging datasets than the Increm name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/ImageMasking.py b/meshroom/nodes/aliceVision/ImageMasking.py index 48a81016..f20cab60 100644 --- a/meshroom/nodes/aliceVision/ImageMasking.py +++ b/meshroom/nodes/aliceVision/ImageMasking.py @@ -1,6 +1,7 @@ __version__ = "3.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ImageMasking(desc.AVCommandLineNode): @@ -134,8 +135,8 @@ class ImageMasking(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/ImageMatching.py b/meshroom/nodes/aliceVision/ImageMatching.py index 64c05330..86961d18 100644 --- a/meshroom/nodes/aliceVision/ImageMatching.py +++ b/meshroom/nodes/aliceVision/ImageMatching.py @@ -2,6 +2,7 @@ __version__ = "2.0" import os from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ImageMatching(desc.AVCommandLineNode): @@ -133,8 +134,8 @@ If images have known poses, use frustum intersection else use VocabularuTree. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py b/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py index 5d834eb9..a94d41ff 100644 --- a/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py +++ b/meshroom/nodes/aliceVision/ImageMatchingMultiSfM.py @@ -2,6 +2,7 @@ __version__ = "1.0" import os from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ImageMatchingMultiSfM(desc.AVCommandLineNode): @@ -136,8 +137,8 @@ Thanks to this node, the FeatureMatching node will only compute the matches betw name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/ImageProcessing.py b/meshroom/nodes/aliceVision/ImageProcessing.py index 8c22e39f..ca540fbd 100644 --- a/meshroom/nodes/aliceVision/ImageProcessing.py +++ b/meshroom/nodes/aliceVision/ImageProcessing.py @@ -1,7 +1,7 @@ __version__ = "3.3" from meshroom.core import desc -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, EXR_STORAGE_DATA_TYPE, RAW_COLOR_INTERPRETATION, VERBOSE_LEVEL import os.path @@ -527,8 +527,8 @@ Convert or apply filtering to the input images. name="rawColorInterpretation", label="RAW Color Interpretation", description="Allows you to choose how RAW data are color processed.", + values=RAW_COLOR_INTERPRETATION, value="DCPLinearProcessing" if os.environ.get("ALICEVISION_COLOR_PROFILE_DB", "") else "LibRawWhiteBalancing", - values=["None", "LibRawNoWhiteBalancing", "LibRawWhiteBalancing", "DCPLinearProcessing", "DCPMetadata", "Auto"], exclusive=True, uid=[0], ), @@ -636,8 +636,8 @@ Convert or apply filtering to the input images. " - half: Use half float (16 bits per channel).\n" " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n" " - auto: Use half float if all values can fit, else use full float.", + values=EXR_STORAGE_DATA_TYPE, value="float", - values=["float", "half", "halfFinite", "auto"], exclusive=True, uid=[0], ), @@ -686,8 +686,8 @@ Convert or apply filtering to the input images. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/ImageSegmentation.py b/meshroom/nodes/aliceVision/ImageSegmentation.py index db9a2e08..004f15c8 100644 --- a/meshroom/nodes/aliceVision/ImageSegmentation.py +++ b/meshroom/nodes/aliceVision/ImageSegmentation.py @@ -1,6 +1,7 @@ __version__ = "1.2" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ImageSegmentation(desc.AVCommandLineNode): @@ -75,8 +76,8 @@ Generate a mask with segmented labels for each pixel. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/ImportE57.py b/meshroom/nodes/aliceVision/ImportE57.py index 1d9b6e00..c5c57dd6 100644 --- a/meshroom/nodes/aliceVision/ImportE57.py +++ b/meshroom/nodes/aliceVision/ImportE57.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ImportE57(desc.AVCommandLineNode): @@ -37,8 +38,8 @@ Import an E57 file and generate an SfMData. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/ImportKnownPoses.py b/meshroom/nodes/aliceVision/ImportKnownPoses.py index e2ad7c4b..0428f8ef 100644 --- a/meshroom/nodes/aliceVision/ImportKnownPoses.py +++ b/meshroom/nodes/aliceVision/ImportKnownPoses.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class ImportKnownPoses(desc.AVCommandLineNode): @@ -30,8 +31,8 @@ class ImportKnownPoses(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/KeyframeSelection.py b/meshroom/nodes/aliceVision/KeyframeSelection.py index b8270e87..ca5bc48d 100644 --- a/meshroom/nodes/aliceVision/KeyframeSelection.py +++ b/meshroom/nodes/aliceVision/KeyframeSelection.py @@ -2,6 +2,7 @@ __version__ = "5.0" import os from meshroom.core import desc +from meshroom.core.utils import EXR_STORAGE_DATA_TYPE, VERBOSE_LEVEL # List of supported video extensions (provided by OpenImageIO) videoExts = [".avi", ".mov", ".mp4", ".m4a", ".m4v", ".3gp", ".3g2", ".mj2", ".m4v", ".mpg"] @@ -314,8 +315,8 @@ You can extract frames at regular interval by configuring only the min/maxFrameS " - half: Use half float (16 bits per channel).\n" " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n" " - auto: Use half float if all values can fit, else use full float.", + values=EXR_STORAGE_DATA_TYPE, value="float", - values=["float", "half", "halfFinite", "auto"], exclusive=True, uid=[0], enabled=lambda node: node.outputExtension.value == "exr", @@ -409,8 +410,8 @@ You can extract frames at regular interval by configuring only the min/maxFrameS name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/LdrToHdrCalibration.py b/meshroom/nodes/aliceVision/LdrToHdrCalibration.py index a467b167..5adca569 100644 --- a/meshroom/nodes/aliceVision/LdrToHdrCalibration.py +++ b/meshroom/nodes/aliceVision/LdrToHdrCalibration.py @@ -6,7 +6,7 @@ import os from collections import Counter from meshroom.core import desc -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, VERBOSE_LEVEL def findMetadata(d, keys, defaultValue): v = None @@ -150,8 +150,8 @@ Calibrate LDR to HDR response curve from samples. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/LdrToHdrMerge.py b/meshroom/nodes/aliceVision/LdrToHdrMerge.py index 56448460..1172dc64 100644 --- a/meshroom/nodes/aliceVision/LdrToHdrMerge.py +++ b/meshroom/nodes/aliceVision/LdrToHdrMerge.py @@ -6,7 +6,7 @@ import math from collections import Counter from meshroom.core import desc -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, EXR_STORAGE_DATA_TYPE, VERBOSE_LEVEL def findMetadata(d, keys, defaultValue): v = None @@ -229,8 +229,8 @@ Merge LDR images into HDR images. " - half: Use half float (16 bits per channel).\n" " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n" " - auto: Use half float if all values can fit, else use full float.", + values=EXR_STORAGE_DATA_TYPE, value="float", - values=["float", "half", "halfFinite", "auto"], exclusive=True, uid=[0], ), @@ -238,8 +238,8 @@ Merge LDR images into HDR images. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/LdrToHdrSampling.py b/meshroom/nodes/aliceVision/LdrToHdrSampling.py index 9ab5c1f9..9e30d960 100644 --- a/meshroom/nodes/aliceVision/LdrToHdrSampling.py +++ b/meshroom/nodes/aliceVision/LdrToHdrSampling.py @@ -6,7 +6,7 @@ import os from collections import Counter from meshroom.core import desc -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, VERBOSE_LEVEL def findMetadata(d, keys, defaultValue): @@ -175,8 +175,8 @@ Sample pixels from Low range images for HDR creation. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/LightingCalibration.py b/meshroom/nodes/aliceVision/LightingCalibration.py index 718f4149..76758afe 100644 --- a/meshroom/nodes/aliceVision/LightingCalibration.py +++ b/meshroom/nodes/aliceVision/LightingCalibration.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class LightingCalibration(desc.CommandLineNode): @@ -47,8 +48,8 @@ Can also be used to calibrate a lighting dome (RTI type). name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/LightingEstimation.py b/meshroom/nodes/aliceVision/LightingEstimation.py index 6bd5275a..1efc9ee2 100644 --- a/meshroom/nodes/aliceVision/LightingEstimation.py +++ b/meshroom/nodes/aliceVision/LightingEstimation.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class LightingEstimation(desc.AVCommandLineNode): @@ -76,8 +77,8 @@ class LightingEstimation(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/MergeMeshes.py b/meshroom/nodes/aliceVision/MergeMeshes.py index 3c844203..a5daffe0 100644 --- a/meshroom/nodes/aliceVision/MergeMeshes.py +++ b/meshroom/nodes/aliceVision/MergeMeshes.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class MergeMeshes(desc.AVCommandLineNode): @@ -59,8 +60,8 @@ Operation types used to merge two meshes: name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/MeshDecimate.py b/meshroom/nodes/aliceVision/MeshDecimate.py index 824cc85e..1c5f5051 100644 --- a/meshroom/nodes/aliceVision/MeshDecimate.py +++ b/meshroom/nodes/aliceVision/MeshDecimate.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class MeshDecimate(desc.AVCommandLineNode): @@ -67,8 +68,8 @@ This node allows to reduce the density of the Mesh. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/MeshDenoising.py b/meshroom/nodes/aliceVision/MeshDenoising.py index f85a30f6..ca9a5177 100644 --- a/meshroom/nodes/aliceVision/MeshDenoising.py +++ b/meshroom/nodes/aliceVision/MeshDenoising.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class MeshDenoising(desc.AVCommandLineNode): @@ -85,8 +86,8 @@ for now, the parameters are difficult to control and vary a lot from one dataset name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/MeshFiltering.py b/meshroom/nodes/aliceVision/MeshFiltering.py index 56369f39..924b8554 100644 --- a/meshroom/nodes/aliceVision/MeshFiltering.py +++ b/meshroom/nodes/aliceVision/MeshFiltering.py @@ -1,6 +1,7 @@ __version__ = "3.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class MeshFiltering(desc.AVCommandLineNode): @@ -115,8 +116,8 @@ This node applies a Laplacian filtering to remove local defects from the raw Mes name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/MeshMasking.py b/meshroom/nodes/aliceVision/MeshMasking.py index 32dc526a..937c8d56 100644 --- a/meshroom/nodes/aliceVision/MeshMasking.py +++ b/meshroom/nodes/aliceVision/MeshMasking.py @@ -1,6 +1,7 @@ __version__ = "1.1" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class MeshMasking(desc.AVCommandLineNode): @@ -99,8 +100,8 @@ Decimate triangles based on image masks. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/MeshResampling.py b/meshroom/nodes/aliceVision/MeshResampling.py index 56c0048b..214e5d8a 100644 --- a/meshroom/nodes/aliceVision/MeshResampling.py +++ b/meshroom/nodes/aliceVision/MeshResampling.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class MeshResampling(desc.AVCommandLineNode): @@ -73,8 +74,8 @@ This node allows to recompute the mesh surface with a new topology and uniform d name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/Meshing.py b/meshroom/nodes/aliceVision/Meshing.py index 9d85bc96..407831f9 100644 --- a/meshroom/nodes/aliceVision/Meshing.py +++ b/meshroom/nodes/aliceVision/Meshing.py @@ -1,6 +1,7 @@ __version__ = "7.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class Meshing(desc.AVCommandLineNode): @@ -513,8 +514,8 @@ A Graph Cut Max-Flow is applied to optimally cut the volume. This cut represents name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/NodalSfM.py b/meshroom/nodes/aliceVision/NodalSfM.py index 79aa5f4f..a8f57e2a 100644 --- a/meshroom/nodes/aliceVision/NodalSfM.py +++ b/meshroom/nodes/aliceVision/NodalSfM.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class NodalSfM(desc.AVCommandLineNode): @@ -51,7 +52,7 @@ A Structure-From-Motion node specifically designed to handle pure rotation camer label="Describer Types", description="Describer types used to describe an image.", value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], + values=DESCRIBER_TYPES, exclusive=False, uid=[0], joinChar=",", @@ -60,8 +61,8 @@ A Structure-From-Motion node specifically designed to handle pure rotation camer name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/NormalIntegration.py b/meshroom/nodes/aliceVision/NormalIntegration.py index be909bb6..edb4ae39 100644 --- a/meshroom/nodes/aliceVision/NormalIntegration.py +++ b/meshroom/nodes/aliceVision/NormalIntegration.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class NormalIntegration(desc.CommandLineNode): commandLine = 'aliceVision_normalIntegration {allParams}' @@ -37,8 +38,8 @@ TODO. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PanoramaCompositing.py b/meshroom/nodes/aliceVision/PanoramaCompositing.py index 1076cab6..0e15e0ae 100644 --- a/meshroom/nodes/aliceVision/PanoramaCompositing.py +++ b/meshroom/nodes/aliceVision/PanoramaCompositing.py @@ -4,6 +4,7 @@ import json import os from meshroom.core import desc +from meshroom.core.utils import EXR_STORAGE_DATA_TYPE, VERBOSE_LEVEL class PanoramaCompositing(desc.AVCommandLineNode): @@ -89,8 +90,8 @@ Multiple cameras are contributing to the low frequencies and only the best one c " - half: Use half float (16 bits per channel).\n" " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n" " - auto: Use half float if all values can fit, else use full float.", + values=EXR_STORAGE_DATA_TYPE, value="float", - values=["float", "half", "halfFinite", "auto"], exclusive=True, uid=[0], ), @@ -112,8 +113,8 @@ Multiple cameras are contributing to the low frequencies and only the best one c name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PanoramaEstimation.py b/meshroom/nodes/aliceVision/PanoramaEstimation.py index be142378..fdf2a832 100644 --- a/meshroom/nodes/aliceVision/PanoramaEstimation.py +++ b/meshroom/nodes/aliceVision/PanoramaEstimation.py @@ -4,6 +4,7 @@ import json import os from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class PanoramaEstimation(desc.AVCommandLineNode): @@ -51,9 +52,8 @@ Estimate relative camera rotations between input images. name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["sift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", - "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -177,8 +177,8 @@ Estimate relative camera rotations between input images. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PanoramaInit.py b/meshroom/nodes/aliceVision/PanoramaInit.py index d409a862..630b8678 100644 --- a/meshroom/nodes/aliceVision/PanoramaInit.py +++ b/meshroom/nodes/aliceVision/PanoramaInit.py @@ -1,6 +1,7 @@ __version__ = "2.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class PanoramaInit(desc.AVCommandLineNode): @@ -144,8 +145,8 @@ This node allows to setup the Panorama: name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PanoramaMerging.py b/meshroom/nodes/aliceVision/PanoramaMerging.py index f55f58a6..d6b0c6c8 100644 --- a/meshroom/nodes/aliceVision/PanoramaMerging.py +++ b/meshroom/nodes/aliceVision/PanoramaMerging.py @@ -4,6 +4,7 @@ import json import os from meshroom.core import desc +from meshroom.core.utils import EXR_STORAGE_DATA_TYPE, VERBOSE_LEVEL class PanoramaMerging(desc.AVCommandLineNode): @@ -57,8 +58,8 @@ Merge all inputs coming from the PanoramaCompositing node. " - half: Use half float (16 bits per channel).\n" " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n" " - auto: Use half float if all values can fit, else use full float.\n", + values=EXR_STORAGE_DATA_TYPE, value="float", - values=["float", "half", "halfFinite", "auto"], exclusive=True, uid=[0], ), @@ -66,8 +67,8 @@ Merge all inputs coming from the PanoramaCompositing node. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PanoramaPostProcessing.py b/meshroom/nodes/aliceVision/PanoramaPostProcessing.py index 81a975aa..5c9d45ee 100644 --- a/meshroom/nodes/aliceVision/PanoramaPostProcessing.py +++ b/meshroom/nodes/aliceVision/PanoramaPostProcessing.py @@ -4,7 +4,7 @@ import json import os from meshroom.core import desc -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, VERBOSE_LEVEL class PanoramaPostProcessing(desc.CommandLineNode): @@ -106,8 +106,8 @@ Post process the panorama. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PanoramaPrepareImages.py b/meshroom/nodes/aliceVision/PanoramaPrepareImages.py index 0c709a42..ace260e6 100644 --- a/meshroom/nodes/aliceVision/PanoramaPrepareImages.py +++ b/meshroom/nodes/aliceVision/PanoramaPrepareImages.py @@ -1,6 +1,7 @@ __version__ = "1.1" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL import os.path @@ -26,8 +27,8 @@ Prepare images for Panorama pipeline: ensures that images orientations are coher name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/PanoramaSeams.py b/meshroom/nodes/aliceVision/PanoramaSeams.py index 4bc35453..15ca8a6d 100644 --- a/meshroom/nodes/aliceVision/PanoramaSeams.py +++ b/meshroom/nodes/aliceVision/PanoramaSeams.py @@ -4,6 +4,7 @@ import json import os from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class PanoramaSeams(desc.AVCommandLineNode): @@ -51,8 +52,8 @@ Estimate the seams lines between the inputs to provide an optimal compositing in name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PanoramaWarping.py b/meshroom/nodes/aliceVision/PanoramaWarping.py index be70ce9f..cbacec45 100644 --- a/meshroom/nodes/aliceVision/PanoramaWarping.py +++ b/meshroom/nodes/aliceVision/PanoramaWarping.py @@ -4,7 +4,7 @@ import json import os from meshroom.core import desc -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, EXR_STORAGE_DATA_TYPE, VERBOSE_LEVEL class PanoramaWarping(desc.AVCommandLineNode): @@ -83,8 +83,8 @@ Compute the image warping for each input image in the panorama coordinate system " - half: Use half float (16 bits per channel).\n" " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n" " - auto: Use half float if all values can fit, else use full float.", + values=EXR_STORAGE_DATA_TYPE, value="float", - values=["float", "half", "halfFinite", "auto"], exclusive=True, uid=[0], ), @@ -92,8 +92,8 @@ Compute the image warping for each input image in the panorama coordinate system name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/PhotometricStereo.py b/meshroom/nodes/aliceVision/PhotometricStereo.py index 047865bc..990ffbae 100644 --- a/meshroom/nodes/aliceVision/PhotometricStereo.py +++ b/meshroom/nodes/aliceVision/PhotometricStereo.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class PhotometricStereo(desc.CommandLineNode): commandLine = 'aliceVision_photometricStereo {allParams}' @@ -75,8 +76,8 @@ The lighting conditions are assumed to be known. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/PrepareDenseScene.py b/meshroom/nodes/aliceVision/PrepareDenseScene.py index 556e98cd..3e954e82 100644 --- a/meshroom/nodes/aliceVision/PrepareDenseScene.py +++ b/meshroom/nodes/aliceVision/PrepareDenseScene.py @@ -1,6 +1,7 @@ __version__ = "3.1" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class PrepareDenseScene(desc.AVCommandLineNode): @@ -93,8 +94,8 @@ This node export undistorted images so the depth map and texturing can be comput name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/Publish.py b/meshroom/nodes/aliceVision/Publish.py index 95578bf7..7479383c 100644 --- a/meshroom/nodes/aliceVision/Publish.py +++ b/meshroom/nodes/aliceVision/Publish.py @@ -3,6 +3,8 @@ from __future__ import print_function __version__ = "1.3" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL + import distutils.dir_util as du import shutil import glob @@ -42,8 +44,8 @@ This node allows to copy files into a specific folder. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/RelativePoseEstimating.py b/meshroom/nodes/aliceVision/RelativePoseEstimating.py index 80294924..918fbfbe 100644 --- a/meshroom/nodes/aliceVision/RelativePoseEstimating.py +++ b/meshroom/nodes/aliceVision/RelativePoseEstimating.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class RelativePoseEstimating(desc.AVCommandLineNode): commandLine = 'aliceVision_relativePoseEstimating {allParams}' @@ -45,8 +46,8 @@ Estimate relative pose between each pair of views that share tracks. name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], exclusive=False, uid=[0], joinChar=",", @@ -62,8 +63,8 @@ Estimate relative pose between each pair of views that share tracks. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/SfMAlignment.py b/meshroom/nodes/aliceVision/SfMAlignment.py index 1ea6be15..db50489b 100644 --- a/meshroom/nodes/aliceVision/SfMAlignment.py +++ b/meshroom/nodes/aliceVision/SfMAlignment.py @@ -1,6 +1,7 @@ __version__ = "2.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL import os.path @@ -104,8 +105,8 @@ The alignment can be based on: name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/SfMDistances.py b/meshroom/nodes/aliceVision/SfMDistances.py index b0fc9760..c82dc148 100644 --- a/meshroom/nodes/aliceVision/SfMDistances.py +++ b/meshroom/nodes/aliceVision/SfMDistances.py @@ -1,6 +1,7 @@ __version__ = "3.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class SfMDistances(desc.AVCommandLineNode): @@ -31,8 +32,8 @@ class SfMDistances(desc.AVCommandLineNode): name="landmarksDescriberTypes", label="Describer Types", description="Describer types used to describe an image (only used when using 'landmarks').", + values=DESCRIBER_TYPES, value=["cctag3"], - values=["sift", "sift_float", "sift_upright", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv"], exclusive=False, uid=[0], joinChar=",", @@ -59,8 +60,8 @@ class SfMDistances(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/SfMMerge.py b/meshroom/nodes/aliceVision/SfMMerge.py index 67c5d88e..530d022e 100644 --- a/meshroom/nodes/aliceVision/SfMMerge.py +++ b/meshroom/nodes/aliceVision/SfMMerge.py @@ -1,6 +1,8 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL + import os.path @@ -57,8 +59,8 @@ Merges two SfMData files into a single one. Fails if some UID is shared among th name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/SfMSplitReconstructed.py b/meshroom/nodes/aliceVision/SfMSplitReconstructed.py index 5e018464..3a2f9faa 100644 --- a/meshroom/nodes/aliceVision/SfMSplitReconstructed.py +++ b/meshroom/nodes/aliceVision/SfMSplitReconstructed.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class SfMSplitReconstructed(desc.AVCommandLineNode): @@ -26,8 +27,8 @@ class SfMSplitReconstructed(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/SfMToRig.py b/meshroom/nodes/aliceVision/SfMToRig.py index 48def995..acfacfec 100644 --- a/meshroom/nodes/aliceVision/SfMToRig.py +++ b/meshroom/nodes/aliceVision/SfMToRig.py @@ -1,6 +1,8 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL + import os.path class SfMToRig(desc.AVCommandLineNode): @@ -24,8 +26,8 @@ Assumes the input SfMData describes a set of cameras capturing a scene at a comm name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/SfMTransfer.py b/meshroom/nodes/aliceVision/SfMTransfer.py index 4a680451..dbbf71ed 100644 --- a/meshroom/nodes/aliceVision/SfMTransfer.py +++ b/meshroom/nodes/aliceVision/SfMTransfer.py @@ -1,6 +1,7 @@ __version__ = "2.1" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL import os.path @@ -96,8 +97,8 @@ This node allows to transfer poses and/or intrinsics form one SfM scene onto ano name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/SfMTransform.py b/meshroom/nodes/aliceVision/SfMTransform.py index b1795832..2fc25c71 100644 --- a/meshroom/nodes/aliceVision/SfMTransform.py +++ b/meshroom/nodes/aliceVision/SfMTransform.py @@ -1,6 +1,7 @@ __version__ = "3.1" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL import os.path @@ -135,8 +136,8 @@ The transformation can be based on: name="landmarksDescriberTypes", label="Landmarks Describer Types", description="Image describer types used to compute the mean of the point cloud (only for 'landmarks' method).", + values=DESCRIBER_TYPES, value=["sift", "dspsift", "akaze"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5", "unknown"], exclusive=False, uid=[0], joinChar=",", @@ -190,8 +191,8 @@ The transformation can be based on: name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/SfMTriangulation.py b/meshroom/nodes/aliceVision/SfMTriangulation.py index aeb369c3..af42b467 100644 --- a/meshroom/nodes/aliceVision/SfMTriangulation.py +++ b/meshroom/nodes/aliceVision/SfMTriangulation.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class SfMTriangulation(desc.AVCommandLineNode): @@ -49,8 +50,8 @@ Contrary to the StructureFromMotion node, this node does not infer the camera po name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], exclusive=False, uid=[0], joinChar=",", @@ -143,8 +144,8 @@ Contrary to the StructureFromMotion node, this node does not infer the camera po name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/SfmBootstraping.py b/meshroom/nodes/aliceVision/SfmBootstraping.py index c33c1f74..3c12b8f8 100644 --- a/meshroom/nodes/aliceVision/SfmBootstraping.py +++ b/meshroom/nodes/aliceVision/SfmBootstraping.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class SfMBootStraping(desc.AVCommandLineNode): @@ -49,8 +50,8 @@ class SfMBootStraping(desc.AVCommandLineNode): name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], exclusive=False, uid=[0], joinChar=",", @@ -59,8 +60,8 @@ class SfMBootStraping(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/SketchfabUpload.py b/meshroom/nodes/aliceVision/SketchfabUpload.py index 670e8801..7d64ee15 100644 --- a/meshroom/nodes/aliceVision/SketchfabUpload.py +++ b/meshroom/nodes/aliceVision/SketchfabUpload.py @@ -1,6 +1,8 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL + import glob import os import json @@ -177,9 +179,9 @@ Upload a textured mesh on Sketchfab. desc.ChoiceParam( name="verboseLevel", label="Verbose Level", - description="Verbosity level (critical, error, warning, info, debug).", + description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["critical", "error", "warning", "info", "debug"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/SphereDetection.py b/meshroom/nodes/aliceVision/SphereDetection.py index 90d07877..5f1bd096 100644 --- a/meshroom/nodes/aliceVision/SphereDetection.py +++ b/meshroom/nodes/aliceVision/SphereDetection.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class SphereDetection(desc.CommandLineNode): @@ -74,8 +75,8 @@ Spheres can be automatically detected or manually defined in the interface. name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/Split360Images.py b/meshroom/nodes/aliceVision/Split360Images.py index 76f1066e..fac1730e 100644 --- a/meshroom/nodes/aliceVision/Split360Images.py +++ b/meshroom/nodes/aliceVision/Split360Images.py @@ -1,6 +1,7 @@ __version__ = "3.0" from meshroom.core import desc +from meshroom.core.utils import VERBOSE_LEVEL class Split360InputNodeSize(desc.DynamicNodeSize): @@ -124,8 +125,8 @@ class Split360Images(desc.AVCommandLineNode): name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/StructureFromMotion.py b/meshroom/nodes/aliceVision/StructureFromMotion.py index 77731b36..6a1ca041 100644 --- a/meshroom/nodes/aliceVision/StructureFromMotion.py +++ b/meshroom/nodes/aliceVision/StructureFromMotion.py @@ -1,6 +1,7 @@ __version__ = "3.3" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class StructureFromMotion(desc.AVCommandLineNode): @@ -97,8 +98,8 @@ It iterates like that, adding cameras and triangulating new 2D features into 3D name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], exclusive=False, uid=[0], joinChar=",", @@ -394,8 +395,8 @@ It iterates like that, adding cameras and triangulating new 2D features into 3D name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ) diff --git a/meshroom/nodes/aliceVision/Texturing.py b/meshroom/nodes/aliceVision/Texturing.py index ed0b491b..e4049aea 100644 --- a/meshroom/nodes/aliceVision/Texturing.py +++ b/meshroom/nodes/aliceVision/Texturing.py @@ -1,7 +1,8 @@ __version__ = "6.0" from meshroom.core import desc, Version -from meshroom.core.utils import COLORSPACES +from meshroom.core.utils import COLORSPACES, VERBOSE_LEVEL + import logging @@ -325,8 +326,8 @@ Many cameras are contributing to the low frequencies and only the best ones cont name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], ), diff --git a/meshroom/nodes/aliceVision/TracksBuilding.py b/meshroom/nodes/aliceVision/TracksBuilding.py index 73e5fcc5..c1b5bc4c 100644 --- a/meshroom/nodes/aliceVision/TracksBuilding.py +++ b/meshroom/nodes/aliceVision/TracksBuilding.py @@ -1,6 +1,7 @@ __version__ = "1.0" from meshroom.core import desc +from meshroom.core.utils import DESCRIBER_TYPES, VERBOSE_LEVEL class TracksBuilding(desc.AVCommandLineNode): @@ -48,8 +49,8 @@ It fuses all feature matches between image pairs into tracks. Each track represe name="describerTypes", label="Describer Types", description="Describer types used to describe an image.", + values=DESCRIBER_TYPES, value=["dspsift"], - values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"], exclusive=False, uid=[0], joinChar=",", @@ -83,8 +84,8 @@ It fuses all feature matches between image pairs into tracks. Each track represe name="verboseLevel", label="Verbose Level", description="Verbosity level (fatal, error, warning, info, debug, trace).", + values=VERBOSE_LEVEL, value="info", - values=["fatal", "error", "warning", "info", "debug", "trace"], exclusive=True, uid=[], )