fix: Add a signal 'expressionApplied' to notify node if an output attribute expression has been applied

Author: nicolas-lambert-tc

meshroom/core/attribute.py

@@ -181,6 +181,7 @@ def _setValue(self, value):
             # validity of the value and apply some conversion if needed
             convertedValue = self.validateValue(value)
             self._value = convertedValue
+            self.expressionApplied.emit()
         # Request graph update when input parameter value is set
         # and parent node belongs to a graph
         # Output attributes value are set internally during the update process,
@@ -352,10 +353,12 @@ def _is3dDisplayable(self) -> bool:
         """
         if self._desc.semantic == "3d":
             return True
+
         # If the attribute is a File attribute, it is an instance of str and can be iterated over
         hasSupportedExt = isinstance(self.value, str) and any(ext in self.value for ext in Attribute.VALID_3D_EXTENSIONS)
         if hasSupportedExt:
             return True
+
         return False
 
     def uid(self) -> str:
@@ -563,6 +566,8 @@ def matchText(self, text: str) -> bool:
     # Whether the attribute or any of its elements is linked by another attribute.
     hasAnyOutputLinks = Property(bool, _hasAnyOutputLinks, notify=outputLinksChanged)
 
+    expressionApplied = Signal()
+
 
 def raiseIfLink(func):
     """ 

meshroom/core/node.py

@@ -1811,10 +1811,10 @@ def _hasDisplayableShape(self):
     hasDuplicatesChanged = Signal()
     hasDuplicates = Property(bool, lambda self: self._hasDuplicates, notify=hasDuplicatesChanged)
 
-    outputAttrEnabledChanged = Signal()
-    hasImageOutput = Property(bool, hasImageOutputAttribute, notify=outputAttrEnabledChanged)
-    hasSequenceOutput = Property(bool, hasSequenceOutputAttribute, notify=outputAttrEnabledChanged)
-    has3DOutput = Property(bool, has3DOutputAttribute, notify=outputAttrEnabledChanged)
+    outputAttrChanged = Signal()
+    hasImageOutput = Property(bool, hasImageOutputAttribute, notify=outputAttrChanged)
+    hasSequenceOutput = Property(bool, hasSequenceOutputAttribute, notify=outputAttrChanged)
+    has3DOutput = Property(bool, has3DOutputAttribute, notify=outputAttrChanged)
     # Whether the node contains a ShapeAttribute, a ShapeListAttribute or a shape File.
     hasDisplayableShape = Property(bool, _hasDisplayableShape, constant=True)
 
@@ -1847,7 +1847,9 @@ def __init__(self, nodeType, position=None, parent=None, uid=None, **kwargs):
         # Declare events for specific output attributes
         for attr in self._attributes:
             if attr.isOutput and attr.desc.semantic == "image":
-                attr.enabledChanged.connect(self.outputAttrEnabledChanged)
+                attr.enabledChanged.connect(self.outputAttrChanged)
+            if attr.isOutput:
+                attr.expressionApplied.connect(self.outputAttrChanged)
 
         # List attributes per UID
         for attr in self._attributes:
@@ -2066,7 +2068,7 @@ def attributeDescFromValue(attrName, value, isOutput):
                     groupDesc.append(eltDesc)
                 attrDesc = desc.GroupAttribute(groupDesc=groupDesc, **params)
             # Override empty default value with
-            attrDesc._value = value
+            attrDesc.value = value
             return attrDesc
         # Handle any other type of parameters as Strings
         return desc.StringParam(**params)

meshroom/ui/qml/Application.qml

@@ -1217,7 +1217,7 @@ Page {
                         workspaceView.viewIn2D(attribute, mouse)
                     }
 
-                    else if (attribute.is3D) {
+                    else if (attribute.is3dDisplayable) {
                             workspaceView.viewIn3D(attribute, mouse)
                     }
 

meshroom/ui/qml/Viewer/Viewer2D.qml

@@ -398,7 +398,7 @@ FocusScope {
 
     Connections {
         target: displayedNode
-        function onOutputAttrEnabledChanged() {
+        function onOutputAttrChanged() {
             tryLoadNode(displayedNode)
         }
     }