[ui] GroupAttribute: Connection validation responsability has been transfered to Attribute.

It let the opportunity to override it in specific Attribute

Author: nicolas-lambert-tc

meshroom/core/attribute.py

@@ -508,6 +508,20 @@ def _is2D(self) -> bool:
             return False
 
         return next((imageSemantic for imageSemantic in Attribute.VALID_IMAGE_SEMANTICS if self.desc.semantic == imageSemantic), None) is not None
+    
+    @Slot(BaseObject, result=bool)
+    def validateConnectionFrom(self, otherAttribute: "Attribute") -> bool:
+        """ Check if the given attribute can be conected to the current Attribute
+        """
+        return self._validateConnectionFrom(otherAttribute)
+    
+    def _validateConnectionFrom(self, otherAttribute: "Attribute") -> bool:
+        """ Implementation of the connection validation
+
+            .. note:
+                Override this method to use custom connection validation logic
+        """
+        return self.baseType == otherAttribute.baseType
 
     name = Property(str, getName, constant=True)
     fullName = Property(str, getFullName, constant=True)
@@ -861,6 +875,19 @@ def __getattr__(self, key):
             except KeyError:
                 raise AttributeError(key)
 
+    def _get_value(self):
+        linkedParam = self.getLinkParam()
+
+        if not linkedParam:
+            return self._value
+        
+        # If linked, the driver attributes values are copied to the current attribute
+        for i, attrDesc in enumerate(self.desc._groupDesc):
+            linkedAttrDesc = linkedParam.desc._groupDesc[i]
+            self._value.get(attrDesc.name).value = linkedParam._value.get(linkedAttrDesc.name).value
+
+        return self._value
+
     def _set_value(self, exportedValue):
         if self._handleLinkValue(exportedValue):
             return
@@ -992,6 +1019,28 @@ def updateInternals(self):
     def matchText(self, text: str) -> bool:
         return super().matchText(text) or any(c.matchText(text) for c in self._value)
 
+    def _validateConnectionFrom(self, otherAttribute:"Attribute") -> bool:
+
+        isValid = super()._validateConnectionFrom(otherAttribute=otherAttribute)
+
+        if not isValid:
+            return False
+
+        return self._haveSameStructure(otherAttribute)
+    
+    def _haveSameStructure(self, otherAttribute: "Attribute") -> bool:
+        """ Does the given attribute have the same number of attributes, and all ordered attributes have the same baseType
+        """
+        
+        if isinstance(otherAttribute._value, Iterable) and len(otherAttribute._value) != len(self._value):
+            return False
+        
+        for i, attr in enumerate(self._value):
+            if attr.baseType != otherAttribute._value[i].baseType:
+                return False
+        
+        return True
+    
     # Override value property
-    value = Property(Variant, Attribute._get_value, _set_value, notify=Attribute.valueChanged)
+    value = Property(Variant, _get_value, _set_value, notify=Attribute.valueChanged)
     isDefault = Property(bool, _isDefault, notify=Attribute.valueChanged)

meshroom/ui/commands.py

@@ -314,8 +314,8 @@ def __init__(self, graph, src, dst, parent=None):
         self.dstAttr = dst.getFullNameToNode()
         self.setText(f"Connect '{self.srcAttr}'->'{self.dstAttr}'")
 
-        if src.baseType != dst.baseType:
-            raise ValueError(f"Attribute types are not compatible and cannot be connected: '{self.srcAttr}'({src.baseType})->'{self.dstAttr}'({dst.baseType})")
+        if not dst.validateConnectionFrom(src):
+            raise ValueError(f"Attribute are not compatible and cannot be connected: '{self.srcAttr}'({src.baseType})->'{self.dstAttr}'({dst.baseType})")
 
     def redoImpl(self):
         self.graph.addEdge(self.graph.attribute(self.srcAttr), self.graph.attribute(self.dstAttr))

meshroom/ui/qml/GraphEditor/AttributePin.qml

@@ -106,7 +106,7 @@ RowLayout {
                 // Check if attributes are compatible to create a valid connection
                 if (root.readOnly                                            // Cannot connect on a read-only attribute
                     || drag.source.objectName != inputDragTarget.objectName  // Not an edge connector
-                    || drag.source.baseType !== inputDragTarget.baseType     // Not the same base type
+                    || !inputDragTarget.attribute.validateConnectionFrom(drag.source.attribute)  //  
                     || drag.source.nodeItem === inputDragTarget.nodeItem     // Connection between attributes of the same node
                     || (drag.source.isList && childrenRepeater.count)        // Source/target are lists but target already has children
                     || drag.source.connectorType === "input"                 // Refuse to connect an "input pin" on another one (input attr can be connected to input attr, but not the graphical pin)
@@ -256,7 +256,7 @@ RowLayout {
             onEntered: function(drag) {
                 // Check if attributes are compatible to create a valid connection
                 if (drag.source.objectName != outputDragTarget.objectName   // Not an edge connector
-                    || drag.source.baseType !== outputDragTarget.baseType   // Not the same base type
+                    || !outputDragTarget.attribute.validateConnectionFrom(drag.source.attribute)  // 
                     || drag.source.nodeItem === outputDragTarget.nodeItem   // Connection between attributes of the same node
                     || (!drag.source.isList && outputDragTarget.isList)     // Connection between a list and a simple attribute
                     || (drag.source.isList && childrenRepeater.count)       // Source/target are lists but target already has children