[core] Add dedicated flatStaticChildren property for GroupAttributes

Rename `getFlattenedChildren` into `getFlatStaticChildren` and have a
default version for all the Attributes, as well as a dedicated one for
GroupAttributes. Children of ListAttributes are currently not taken
into account when gathering the list of children.

Author: cbentejac

meshroom/core/attribute.py

@@ -413,32 +413,12 @@ def updateInternals(self):
         # Emit if the enable status has changed
         self.setEnabled(self.getEnabled())
 
-    def getFlattenedChildren(self):
+    def getFlatStaticChildren(self):
         """ Return a list of all the attributes that refer to this instance as their parent through
         the 'root' property. If no such attribute exist, return an empty list. The depth difference is not
         taken into account in the list, which is thus always flat. """
-        attributes = ListModel(parent=self)
-        if isinstance(self._value, str):
-            # String/File attributes are iterable but cannot have children: immediately rule that case out
-            return attributes
-
-        try:
-            # If self._value is not iterable, then it is not an attribute that can have children
-            iter(self._value)
-        except TypeError:
-            return attributes
-
-        for attribute in self._value:
-            if not isinstance(attribute, Attribute):
-                # Handle ChoiceParam values, which contained in a list hence iterable, but are string
-                continue
-            attributes.add(attribute)
-            if isinstance(attribute, ListAttribute) or isinstance(attribute, GroupAttribute):
-                # Handle nested ListAttributes and GroupAttributes
-                flattened = attribute.getFlattenedChildren()
-                for i in flattened:
-                    attributes.add(i)
-        return attributes
+        # For all attributes but GroupAttributes, there cannot be any child
+        return ListModel(parent=self)
 
     name = Property(str, getName, constant=True)
     fullName = Property(str, getFullName, constant=True)
@@ -483,7 +463,7 @@ def getFlattenedChildren(self):
     validValue = Property(bool, getValidValue, setValidValue, notify=validValueChanged)
     root = Property(BaseObject, root.fget, constant=True)
     depth = Property(int, getDepth, constant=True)
-    flattenedChildren = Property(BaseObject, getFlattenedChildren, constant=True)
+    flatStaticChildren = Property(BaseObject, getFlatStaticChildren, constant=True)
 
 
 def raiseIfLink(func):
@@ -836,10 +816,39 @@ def updateInternals(self):
         for attr in self._value:
             attr.updateInternals()
 
+    def getFlatStaticChildren(self):
+        """ Return a list of all the attributes that refer to this instance of GroupAttribute as their parent
+        through the 'root' property. In the case of GroupAttributes, any attribute within said group will be
+        a child. The depth difference is not taken into account when generating the list, which is thus always
+        flat. """
+        attributes = ListModel(parent=self)
+        if isinstance(self._value, str):
+            # String/File attributes are iterable but cannot have children: immediately rule that case out
+            return attributes
+
+        try:
+            # If self._value is not iterable, then it is not an attribute that can have children
+            iter(self._value)
+        except TypeError:
+            return attributes
+
+        for attribute in self._value:
+            if not isinstance(attribute, Attribute):
+                # Handle ChoiceParam values, which are contained in a list hence iterable, but are string
+                continue
+            attributes.append(attribute)
+            if isinstance(attribute, GroupAttribute):
+                # Handle nested GroupAttributes
+                flattened = attribute.getFlatStaticChildren()
+                for i in flattened:
+                    attributes.append(i)
+        return attributes
+
     @Slot(str, result=bool)
     def matchText(self, text):
         return super().matchText(text) or any(c.matchText(text) for c in self._value)
 
     # Override value property
     value = Property(Variant, Attribute._get_value, _set_value, notify=Attribute.valueChanged)
     isDefault = Property(bool, _isDefault, notify=Attribute.valueChanged)
+    flatStaticChildren = Property(BaseObject, getFlatStaticChildren, constant=True)

meshroom/ui/qml/GraphEditor/Node.qml

@@ -153,10 +153,10 @@ Item {
                     parentPins.set(attr.name, false)
                 }
 
-                for (let j = 0; j < attr.flattenedChildren.count; ++j) {
-                    attributes.push(attr.flattenedChildren.at(j))
-                    if (attr.flattenedChildren.at(j).type === "GroupAttribute") {
-                        parentPins.set(attr.flattenedChildren.at(j).name, false)
+                for (let j = 0; j < attr.flatStaticChildren.count; ++j) {
+                    attributes.push(attr.flatStaticChildren.at(j))
+                    if (attr.flatStaticChildren.at(j).type === "GroupAttribute") {
+                        parentPins.set(attr.flatStaticChildren.at(j).name, false)
                     }
                 }
             }