Support display and connection of attributes that are part of GroupAttributes

meshroom/core/attribute.py

@@ -64,6 +64,9 @@ def __init__(self, node, attributeDesc, isOutput, root=None, parent=None):
         self._description = attributeDesc.description
         self._invalidate = False if self._isOutput else attributeDesc.invalidate
 
+        self._exposed = root.exposed if root is not None else attributeDesc.exposed
+        self._depth = root.depth + 1 if root is not None else 0
+
         # invalidation value for output attributes
         self._invalidationValue = ""
 
@@ -79,6 +82,12 @@ def node(self):
     def root(self):
         return self._root() if self._root else None
 
+    def getDepth(self):
+        return self._depth
+
+    def getExposed(self):
+        return self._exposed
+
     def getName(self):
         """ Attribute name """
         return self._name
@@ -330,7 +339,7 @@ def _applyExpr(self):
         elif self.isInput and Attribute.isLinkExpression(v):
             # value is a link to another attribute
             link = v[1:-1]
-            linkNode, linkAttr = link.split('.')
+            linkNode, linkAttr = link.split('.', 1)
             try:
                 g.addEdge(g.node(linkNode).attribute(linkAttr), self)
             except KeyError as err:
@@ -397,6 +406,13 @@ def updateInternals(self):
         # Emit if the enable status has changed
         self.setEnabled(self.getEnabled())
 
+    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. """
+        # For all attributes but GroupAttributes, there cannot be any child
+        return []
+
     name = Property(str, getName, constant=True)
     fullName = Property(str, getFullName, constant=True)
     fullNameToNode = Property(str, getFullNameToNode, constant=True)
@@ -409,6 +425,7 @@ def updateInternals(self):
     type = Property(str, getType, constant=True)
     baseType = Property(str, getType, constant=True)
     isReadOnly = Property(bool, _isReadOnly, constant=True)
+    exposed = Property(bool, getExposed, constant=True)
 
     # Description of the attribute
     descriptionChanged = Signal()
@@ -438,6 +455,8 @@ def updateInternals(self):
     validValueChanged = Signal()
     validValue = Property(bool, getValidValue, setValidValue, notify=validValueChanged)
     root = Property(BaseObject, root.fget, constant=True)
+    depth = Property(int, getDepth, constant=True)
+    flatStaticChildren = Property(Variant, getFlatStaticChildren, constant=True)
 
 
 def raiseIfLink(func):
@@ -790,10 +809,25 @@ 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 = []
+
+        # Iterate over the values and add the flat children of every child (if they exist)
+        for attribute in self._value:
+            attributes.append(attribute)
+            attributes = attributes + attribute.getFlatStaticChildren()
+
+        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(Variant, getFlatStaticChildren, constant=True)

meshroom/core/node.py

@@ -1711,9 +1711,18 @@
         attrDesc = next((d for d in refAttributes if d.name == name), None)
         if attrDesc is None:
             return None
+
         # We have found a description, and we still need to
         # check if the value matches the attribute description.
-        #
+
+        # If it is a GroupAttribute, all attributes within the group should be matched individually
+        # so that links that can be correctly evaluated
+        if isinstance(attrDesc, desc.GroupAttribute):
+            for k, v in value.items():
+                if CompatibilityNode.attributeDescFromName(attrDesc.groupDesc, k, v, strict=True) is None:
+                    return None
+            return attrDesc
+
         # If it is a serialized link expression (no proper value to set/evaluate)
         if Attribute.isLinkExpression(value):
             return attrDesc

meshroom/ui/graph.py

@@ -760,7 +760,8 @@ def duplicateNodesFrom(self, nodes: list[Node]) -> list[Node]:
     def canExpandForLoop(self, currentEdge):
         """ Check if the list attribute can be expanded by looking at all the edges connected to it. """
         listAttribute = currentEdge.src.root
-        if not listAttribute:
+        # Check that the parent is indeed a ListAttribute (it could be a GroupAttribute, for instance)
+        if not listAttribute or not isinstance(listAttribute, ListAttribute):
             return False
         srcIndex = listAttribute.index(currentEdge.src)
         allSrc = [e.src for e in self._graph.edges.values()]

meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml

@@ -35,8 +35,9 @@ RowLayout {
             var tooltip = ""
             if (!attribute.validValue && attribute.desc.errorMessage !== "")
                 tooltip += "<i><b>Error: </b>" + Format.plainToHtml(attribute.desc.errorMessage) + "</i><br><br>"
-            tooltip += "<b> " + attribute.desc.name + ":</b> " + attribute.type + "<br>" + Format.plainToHtml(attribute.desc.description)
+            tooltip += "<b> " + attribute.fullName + ":</b> " + attribute.type + "<br>" + Format.plainToHtml(attribute.desc.description)
 
+            console.warn(attribute.fullName)
             parameterTooltip.text = tooltip
         }
     }
@@ -85,7 +86,7 @@ RowLayout {
                         var tooltip = ""
                         if (!object.validValue && object.desc.errorMessage !== "")
                             tooltip += "<i><b>Error: </b>" + Format.plainToHtml(object.desc.errorMessage) + "</i><br><br>"
-                        tooltip += "<b>" + object.desc.name + ":</b> " + attribute.type + "<br>" + Format.plainToHtml(object.description)
+                        tooltip += "<b>" + object.fullName + ":</b> " + attribute.type + "<br>" + Format.plainToHtml(object.description)
                         return tooltip
                     }
                     visible: parameterMA.containsMouse