[ui] Attribute: Remove occurence to deprecated validValue/errorMessage

Author: nicolas-lambert-tc

meshroom/core/attribute.py

@@ -73,7 +73,6 @@ def __init__(self, node, attributeDesc, isOutput, root=None, parent=None):
         self._isOutput = isOutput
         self._label = attributeDesc.label
         self._enabled = True
-        self._validValue = True
         self._description = attributeDesc.description
         self._invalidate = False if self._isOutput else attributeDesc.invalidate
 
@@ -169,24 +168,6 @@ def getUidIgnoreValue(self):
         """ Value for which the attribute should be ignored during the UID computation. """
         return self.attributeDesc.uidIgnoreValue
 
-    def getValidValue(self):
-        """
-        Get the status of _validValue:
-            - If it is a function, execute it and return the result
-            - Otherwise, simply return its value
-        """
-        if isinstance(self.desc.validValue, types.FunctionType):
-            try:
-                return self.desc.validValue(self.node)
-            except Exception:
-                return True
-        return self._validValue
-
-    def setValidValue(self, value):
-        if self._validValue == value:
-            return
-        self._validValue = value
-
     def validateValue(self, value):
         return self.desc.validateValue(value)
 
@@ -224,7 +205,6 @@ def _set_value(self, value):
             self.requestNodeUpdate()
 
         self.valueChanged.emit()
-        self.validValueChanged.emit()
 
     @Slot()
     def _onValueChanged(self):
@@ -550,8 +530,6 @@ def _isMandatory(self) -> bool:
     enabled = Property(bool, getEnabled, setEnabled, notify=enabledChanged)
     invalidate = Property(bool, lambda self: self._invalidate, constant=True)
     uidIgnoreValue = Property(Variant, getUidIgnoreValue, constant=True)
-    validValueChanged = Signal()
-    validValue = Property(bool, getValidValue, setValidValue, notify=validValueChanged)
     root = Property(BaseObject, root.fget, constant=True)
 
     errorMessageChanged = Signal()

meshroom/core/desc/attribute.py

@@ -19,8 +19,6 @@ class Attribute(BaseObject):
     def __init__(self, name, label, description, value, advanced, semantic, group, enabled, 
                  invalidate=True,
                  uidIgnoreValue=None, 
-                 validValue=True, 
-                 errorMessage="", 
                  visible=True, 
                  exposed=False, 
                  validators:list["AttributeValidator"]=None
@@ -37,8 +35,6 @@ def __init__(self, name, label, description, value, advanced, semantic, group, e
         self._invalidate = invalidate
         self._semantic = semantic
         self._uidIgnoreValue = uidIgnoreValue
-        self._validValue = validValue
-        self._errorMessage = errorMessage
         self._visible = visible
         self._exposed = exposed
         self._isExpression = (isinstance(self._value, str) and "{" in self._value) \
@@ -108,8 +104,6 @@ def validators(self):
     invalidate = Property(Variant, lambda self: self._invalidate, constant=True)
     semantic = Property(str, lambda self: self._semantic, constant=True)
     uidIgnoreValue = Property(Variant, lambda self: self._uidIgnoreValue, constant=True)
-    validValue = Property(Variant, lambda self: self._validValue, constant=True)
-    errorMessage = Property(str, lambda self: self._errorMessage, constant=True)
     # visible:
     #   The attribute is not displayed in the Graph Editor if False but still visible in the Node Editor.
     #   This property is useful to hide some attributes that are not relevant for the user.
@@ -286,11 +280,11 @@ class Param(Attribute):
     """
     """
     def __init__(self, name, label, description, value, group, advanced, semantic, enabled, invalidate=True,
-                 uidIgnoreValue=None, validValue=True, errorMessage="", visible=True, exposed=False, validators=None):
+                 uidIgnoreValue=None, visible=True, exposed=False, validators=None):
         super(Param, self).__init__(name=name, label=label, description=description, value=value,
                                     group=group, advanced=advanced, enabled=enabled, invalidate=invalidate,
-                                    semantic=semantic, uidIgnoreValue=uidIgnoreValue, validValue=validValue,
-                                    errorMessage=errorMessage, visible=visible, exposed=exposed, validators=validators)
+                                    semantic=semantic, uidIgnoreValue=uidIgnoreValue, visible=visible, exposed=exposed,
+                                    validators=validators)
 
 
 class File(Attribute):
@@ -351,11 +345,11 @@ class IntParam(Param):
     """
     """
     def __init__(self, name, label, description, value, range=None, group="allParams", advanced=False, enabled=True,
-                 invalidate=True, semantic="", validValue=True, errorMessage="", visible=True, exposed=False, validators=None):
+                 invalidate=True, semantic="", visible=True, exposed=False, validators=None):
         self._range = range
         super(IntParam, self).__init__(name=name, label=label, description=description, value=value,
                                        group=group, advanced=advanced, enabled=enabled, invalidate=invalidate,
-                                       semantic=semantic, validValue=validValue, errorMessage=errorMessage,
+                                       semantic=semantic,
                                        visible=visible, exposed=exposed, validators=validators)
         self._valueType = int
 
@@ -381,11 +375,11 @@ class FloatParam(Param):
     """
     """
     def __init__(self, name, label, description, value, range=None, group="allParams", advanced=False, enabled=True,
-                 invalidate=True, semantic="", validValue=True, errorMessage="", visible=True, exposed=False, validators=None):
+                 invalidate=True, semantic="", visible=True, exposed=False, validators=None):
         self._range = range
         super(FloatParam, self).__init__(name=name, label=label, description=description, value=value,
                                          group=group, advanced=advanced, enabled=enabled, invalidate=invalidate,
-                                         semantic=semantic, validValue=validValue, errorMessage=errorMessage,
+                                         semantic=semantic,
                                          visible=visible, exposed=exposed, validators=validators)
         self._valueType = float
 
@@ -447,13 +441,12 @@ class ChoiceParam(Param):
     _OVERRIDE_SERIALIZATION_KEY_VALUES = "__ChoiceParam_values__"
 
     def __init__(self, name: str, label: str, description: str, value, values, exclusive=True, saveValuesOverride=False, 
-                 group="allParams", joinChar=" ", advanced=False, enabled=True, invalidate=True, semantic="", 
-                 validValue=True, errorMessage="",
+                 group="allParams", joinChar=" ", advanced=False, enabled=True, invalidate=True, semantic="",
                  visible=True, exposed=False, validators=None):
 
         super(ChoiceParam, self).__init__(name=name, label=label, description=description, value=value,
                                           group=group, advanced=advanced, enabled=enabled, invalidate=invalidate,
-                                          semantic=semantic, validValue=validValue, errorMessage=errorMessage,
+                                          semantic=semantic,
                                           visible=visible, exposed=exposed, validators=validators)
         self._values = values
         self._saveValuesOverride = saveValuesOverride
@@ -527,12 +520,12 @@ class StringParam(Param):
     """
     """
     def __init__(self, name, label, description, value, group="allParams", advanced=False, enabled=True,
-                 invalidate=True, semantic="", uidIgnoreValue=None, validValue=True, errorMessage="", visible=True,
+                 invalidate=True, semantic="", uidIgnoreValue=None, visible=True,
                  exposed=False, validators=None):
         super(StringParam, self).__init__(name=name, label=label, description=description, value=value,
                                           group=group, advanced=advanced, enabled=enabled, invalidate=invalidate,
-                                          semantic=semantic, uidIgnoreValue=uidIgnoreValue, validValue=validValue,
-                                          errorMessage=errorMessage, visible=visible, exposed=exposed, validators=validators)
+                                          semantic=semantic, uidIgnoreValue=uidIgnoreValue, 
+                                          visible=visible, exposed=exposed, validators=validators)
         self._valueType = str
 
     def validateValue(self, value):

meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml

@@ -102,11 +102,7 @@ RowLayout {
                     y: parameterMA.mouseY + 10
 
                     text: {
-                        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)
-                        return tooltip
+                        return `<b>${object.desc.name} :</b> ${attribute.type}  <br> ${Format.plainToHtml(object.description)}`
                     }
                     visible: parameterMA.containsMouse
                     delay: 800