[nodes] ExportAnimatedCamera: Use lambdas instead of update method

alicevision · Feb 19, 2021 · b0487dc · b0487dc
1 parent d77d268
commit b0487dc
Showing 1 changed file with 11 additions and 28 deletions.
diff --git a/meshroom/nodes/aliceVision/ExportAnimatedCamera.py b/meshroom/nodes/aliceVision/ExportAnimatedCamera.py
@@ -41,11 +41,22 @@ class ExportAnimatedCamera(desc.CommandLineNode):
             value=False,
             uid=[0],
         ),
+       desc.ChoiceParam(
+            name='undistortedImageType',
+            label='Undistort Image Format ',
+            description='Image file format to use for undistorted images ("jpg", "png", "tif", "exr (half)").',
+            value='exr',
+            values=['jpg', 'png', 'tif', 'exr'],
+            exclusive=True,
+            uid=[0],
+            enabled= lambda node: node.exportUndistortedImages.value,
+        ),
         desc.BoolParam(
             name='exportFullROD',
             label='Export Full ROD',
             description='Export Full ROD.',
             value=False,
+            enabled=lambda node: node.exportUndistortedImages.value and node.undistortedImageType.value == 'exr',
             uid=[0],
         ),
         desc.BoolParam(
@@ -55,16 +66,6 @@ class ExportAnimatedCamera(desc.CommandLineNode):
             value=True,
             uid=[0],
         ),
-       desc.ChoiceParam(
-            name='undistortedImageType',
-            label='Undistort Image Format ',
-            description='Image file format to use for undistorted images ("jpg", "png", "tif", "exr (half)").',
-            value= lambda node: 'jpg' or 'exr' and not node.exportFullROD,
-            values=['jpg', 'png', 'tif', 'exr'],
-            exclusive=True,
-            uid=[0],
-            enabled= lambda node: node.exportUndistortedImages.value == 1,
-        ),
         desc.ChoiceParam(
             name='verboseLevel',
             label='Verbose Level',
@@ -93,22 +94,4 @@ class ExportAnimatedCamera(desc.CommandLineNode):
             uid=[],
         ),
         ]
-    prev = False
-    @classmethod
-    def update(cls, node):
-        if not isinstance(node.nodeDesc, cls):
-            raise ValueError("Node {} is not an instance of type {}".format(node, cls))
-            # TODO: use Node version for this test
-
-        if not cls.prev:
-            node.undistortedImageType.value = 'jpg'
-            cls.prev = True
-
-        if node.exportFullROD.value:
-            node.undistortedImageType.value = 'exr'
-            node.undistortedImageType.enabled = False
-        else:
-            node.undistortedImageType.enabled = True
 
-        if not node.exportUndistortedImages.value:
-            node.exportFullROD.value = False