Merge pull request #1965 from alicevision/dev/attributeRefactoring

[meshroom] Attribute Refactoring

Author: cbentejac

meshroom/aliceVision/KeyframeSelection.py

@@ -15,7 +15,7 @@ def computeSize(self, node):
 
         # Compute the size for each entry in the list of input paths
         for input in node.attribute("inputPaths").value:
-            self._param = input.getFullName()
+            self._param = input.fullName
             s = s + super(KeyframeSelectionNodeSize, self).computeSize(node)
 
         # Retrieve the maximum number of keyframes for the smart selection (which is high by default)

meshroom/aliceVision/LdrToHdrCalibration.py

@@ -176,7 +176,7 @@ def update(cls, node):
             return
         node.userNbBrackets.validValue = True  # Reset the status of "userNbBrackets"
 
-        cameraInitOutput = node.input.getLinkParam(recursive=True)
+        cameraInitOutput = node.input.inputRootLink
         if not cameraInitOutput:
             node.nbBrackets.value = 0
             return
@@ -194,7 +194,7 @@ def update(cls, node):
 
         if not cameraInitOutput.node.hasAttribute("viewpoints"):
             if cameraInitOutput.node.hasAttribute("input"):
-                cameraInitOutput = cameraInitOutput.node.input.getLinkParam(recursive=True)
+                cameraInitOutput = cameraInitOutput.node.input.inputRootLink
         if cameraInitOutput and cameraInitOutput.node and cameraInitOutput.node.hasAttribute("viewpoints"):
             viewpoints = cameraInitOutput.node.viewpoints.value
         else:

meshroom/aliceVision/LdrToHdrMerge.py

@@ -249,7 +249,7 @@ def update(cls, node):
             return
         node.userNbBrackets.validValue = True  # Reset the status of "userNbBrackets"
 
-        cameraInitOutput = node.input.getLinkParam(recursive=True)
+        cameraInitOutput = node.input.inputRootLink
         if not cameraInitOutput:
             node.nbBrackets.value = 0
             return
@@ -267,7 +267,7 @@ def update(cls, node):
 
         if not cameraInitOutput.node.hasAttribute("viewpoints"):
             if cameraInitOutput.node.hasAttribute("input"):
-                cameraInitOutput = cameraInitOutput.node.input.getLinkParam(recursive=True)
+                cameraInitOutput = cameraInitOutput.node.input.inputRootLink
         if cameraInitOutput and cameraInitOutput.node and cameraInitOutput.node.hasAttribute("viewpoints"):
             viewpoints = cameraInitOutput.node.viewpoints.value
         else:

meshroom/aliceVision/LdrToHdrSampling.py

@@ -202,7 +202,7 @@ def update(cls, node):
         node.outliersNb = 0  # Reset the number of detected outliers
         node.userNbBrackets.validValue = True  # Reset the status of "userNbBrackets"
 
-        cameraInitOutput = node.input.getLinkParam(recursive=True)
+        cameraInitOutput = node.input.inputRootLink
         if not cameraInitOutput:
             node.nbBrackets.value = 0
             return
@@ -220,7 +220,7 @@ def update(cls, node):
 
         if not cameraInitOutput.node.hasAttribute("viewpoints"):
             if cameraInitOutput.node.hasAttribute("input"):
-                cameraInitOutput = cameraInitOutput.node.input.getLinkParam(recursive=True)
+                cameraInitOutput = cameraInitOutput.node.input.inputRootLink
         if cameraInitOutput and cameraInitOutput.node and cameraInitOutput.node.hasAttribute("viewpoints"):
             viewpoints = cameraInitOutput.node.viewpoints.value
         else:

meshroom/aliceVision/MaskProcessing.py

@@ -14,15 +14,15 @@ def __init__(self, param):
         self._params = param
 
     def computeSize(self, node):
-        
+
         size = 0
 
         for input in node.attribute(self._params).value:
-            paramName = input.getFullName()
+            paramName = input.fullName
             param = node.attribute(paramName)
             if param.isLink:
-                size = max(size, param.getLinkParam().node.size)
-        
+                size = max(size, param.inputLink.node.size)
+
         return size
 
 

meshroom/aliceVision/SfMMerge.py

@@ -14,14 +14,14 @@ def __init__(self, param):
         self._params = param
 
     def computeSize(self, node):
-        
+
         size = 0
 
         for input in node.attribute(self._params).value:
-            paramName = input.getFullName()
+            paramName = input.fullName
             param = node.attribute(paramName)
-            size = size + param.getLinkParam().node.size
-        
+            size = size + param.inputLink.node.size
+
         return size