[ui] Node: If a node have at least one attribute not validated, it displays a warning icon, and selection border is orange

Author: nicolas-lambert-tc

meshroom/core/graph.py

@@ -1564,6 +1564,7 @@ def setVerbose(self, v):
     updated = Signal()
     canComputeLeavesChanged = Signal()
     canComputeLeaves = Property(bool, lambda self: self._canComputeLeaves, notify=canComputeLeavesChanged)
+    attributeValueChanged = Signal(Attribute)
 
 
 def loadGraph(filepath, strictCompatibility: bool = False) -> Graph:

meshroom/core/node.py

@@ -1620,6 +1620,12 @@ def has3DOutputAttribute(self):
 
         return next((attr for attr in self._attributes if attr.enabled and attr.isOutput and attr.is3D), None) is not None
 
+    def _hasInvalidAttribute(self):
+        for attribute in self._attributes:
+            if len(attribute.errorMessages) > 0:
+                return True
+        return False
+
     name = Property(str, getName, constant=True)
     defaultLabel = Property(str, getDefaultLabel, constant=True)
     nodeType = Property(str, nodeType.fget, constant=True)
@@ -1672,6 +1678,9 @@ def has3DOutputAttribute(self):
     hasSequenceOutput = Property(bool, hasSequenceOutputAttribute, notify=outputAttrEnabledChanged)
     has3DOutput = Property(bool, has3DOutputAttribute, notify=outputAttrEnabledChanged)
 
+    hasInvalidAttributeChanged = Signal()
+    hasInvalidAttribute = Property(bool, _hasInvalidAttribute, notify=hasInvalidAttributeChanged)
+
 
 class Node(BaseNode):
     """

meshroom/ui/commands.py

@@ -295,17 +295,23 @@ def redoImpl(self):
         if self.value == self.oldValue:
             return False
         if self.graph.attribute(self.attrName) is not None:
-            self.graph.attribute(self.attrName).value = self.value
+            attribute = self.graph.attribute(self.attrName)
         else:
-            self.graph.internalAttribute(self.attrName).value = self.value
+            attribute = self.graph.internalAttribute(self.attrName)
+
+        attribute.value = self.value        
+        self.graph.attributeValueChanged.emit(attribute)
+
         return True
 
     def undoImpl(self):
         if self.graph.attribute(self.attrName) is not None:
-            self.graph.attribute(self.attrName).value = self.oldValue
+            attribute = self.graph.attribute(self.attrName)
         else:
-            self.graph.internalAttribute(self.attrName).value = self.oldValue
-
+            attribute = self.graph.internalAttribute(self.attrName)
+        
+        attribute.value = self.oldValue
+        self.graph.attributeValueChanged.emit(attribute)
 
 class AddEdgeCommand(GraphCommand):
     def __init__(self, graph, src, dst, parent=None):

meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml

@@ -29,7 +29,6 @@ RowLayout {
     signal inAttributeClicked(var srcItem, var mouse, var inAttributes)
     signal outAttributeClicked(var srcItem, var mouse, var outAttributes)
     signal showInViewer(var attr)
-    signal attributeEdited(var attribute)
 
     spacing: 2
 
@@ -382,7 +381,6 @@ RowLayout {
                     onEditingFinished: {
                         setTextFieldAttribute(text)
                         errorMessages = attribute.errorMessages
-                        root.attributeEdited(attribute)
                     }
 
                     onAccepted: {

meshroom/ui/qml/GraphEditor/GraphEditor.qml

@@ -851,6 +851,7 @@ Item {
 
                     mainSelected: uigraph.selectedNode === node
                     hovered: uigraph.hoveredNode === node
+                    hasWarnings: node.hasInvalidAttribute
 
                     // ItemSelectionModel.hasSelection triggers updates anytime the selectionChanged() signal is emitted.
                     selected: uigraph.nodeSelection.hasSelection ? uigraph.nodeSelection.isRowSelected(index) : false
@@ -979,6 +980,13 @@ Item {
                         enabled: !nodeRepeater.ongoingDrag
                         NumberAnimation { duration: 100 }
                     }
+
+                    Connections {
+                        target: uigraph.graph
+                        function onAttributeValueChanged() {
+                            hasWarnings = node.hasInvalidAttribute
+                        }
+                    }
                 }
             }
         }

meshroom/ui/qml/GraphEditor/Node.qml

@@ -32,6 +32,7 @@ Item {
     property color baseColor: defaultColor
 
     property point mousePosition: Qt.point(mouseArea.mouseX, mouseArea.mouseY)
+    property bool hasWarnings: false
 
     Item {
         id: m
@@ -154,6 +155,11 @@ Item {
                 return 2
             }
             border.color: {
+
+                if(hasWarnings === true) {
+                    return "orange"                    
+                }
+                
                 if(root.mainSelected)
                     return activePalette.highlight
                 if(root.selected)
@@ -272,6 +278,17 @@ Item {
                                 }
                             }
 
+                            // Attribute warnings
+                            MaterialLabel {
+                                visible: hasWarnings
+                                text: MaterialIcons.warning
+                                color: "orange"
+                                padding: 2
+                                font.pointSize: 7
+                                palette.text: Colors.sysPalette.text
+                                ToolTip.text: "Some attribute validation are failing"
+                            }
+
                             // Submitted externally indicator
                             MaterialLabel {
                                 visible: node.isExternal