[ui] ExpressionTextField : fix binding issues on hdrtoolbar and attributedelegate

Author: Alxiice

meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml

@@ -622,12 +622,18 @@ RowLayout {
                     isInt: attribute.type === "FloatParam" ? false : true
 
                     onEditingFinished: {
-                        if (!hasExprError)
+                        if (!hasExprError) {
                             setTextFieldAttribute(expressionTextField.evaluatedValue)
+                            // Restore binding
+                            expressionTextField.text = Qt.binding(function() { return String(expressionTextField.displayValue); })
+                        }
                     }
                     onAccepted: {
-                        if (!hasExprError)
+                        if (!hasExprError) {
                             setTextFieldAttribute(expressionTextField.evaluatedValue)
+                            // Restore binding
+                            expressionTextField.text = Qt.binding(function() { return String(expressionTextField.displayValue); })
+                        }
                         // When the text is too long, display the left part
                         // (with the most important values and cut the floating point details)
                         ensureVisible(0)
@@ -664,7 +670,7 @@ RowLayout {
                             if (!pressed) {
                                 _reconstruction.setAttribute(attribute, formattedValue)
                                 updateAttributeLabel()
-                            }
+                            } 
                         }
                     }
                 }

meshroom/ui/qml/Utils/ExpressionTextField.qml

@@ -30,16 +30,6 @@ TextField {
         hasExprError = false
     }
 
-    function reset(_value) {
-        clearError()
-        evaluatedValue = _value
-        if (isInt) {
-            root.text = _value.toFixed(0)
-        } else {
-            root.text = _value.toFixed(decimals)
-        }
-    }
-
     function getEvalExpression(_text) {
         var [_res, _err] = _reconstruction.evaluateMathExpression(_text)
         if (_err == false) {
@@ -49,7 +39,7 @@ TextField {
                 _res = _res.toFixed(decimals)
             return _res
         } else {
-            console.error("Error evaluating expression (", _text, "):", _err)
+            console.error("Error : Expression", _text, "is invalid")
             return NaN
         }
     }
@@ -65,27 +55,39 @@ TextField {
     function updateExpression() {
         var previousEvaluatedValue = evaluatedValue
         var result = getEvalExpression(root.text)
-        console.log("[ExpressionTextField] updateExpression", root.text, "->", result)
         if (!isNaN(result)) {
             evaluatedValue = result
             clearError()
-            // return result
         } else {
             evaluatedValue = previousEvaluatedValue
             raiseError()
-            // return NaN
         }
     }
 
-    // When user commits input, evaluate but do NOT overwrite text
+    // onAccepted and onEditingFinished will break the bindings to text
+    // so if used on fields that needs to be driven by sliders or other qml element,
+    // the binding needs to be restored
+    // No need to restore the binding if the expression has an error because we don't break it
+
     onAccepted: {
-        console.log("[ExpressionTextField] onAccepted", root.text)
         updateExpression()
+        if (!hasExprError && !isNaN(evaluatedValue)) {
+            // Commit the result value to the text field
+            if (isInt)
+                root.text = Number(evaluatedValue).toFixed(0)
+            else
+                root.text = Number(evaluatedValue).toFixed(decimals)
+        }
     }
 
     onEditingFinished: {
-        console.log("[ExpressionTextField] onEditingFinished", root.text)
         updateExpression()
+        if (!hasExprError && !isNaN(evaluatedValue)) {
+            if (isInt)
+                root.text = Number(evaluatedValue).toFixed(0)
+            else
+                root.text = Number(evaluatedValue).toFixed(decimals)
+        }
     }
 
     onTextChanged: {
@@ -95,7 +97,6 @@ TextField {
     }
 
     Component.onCompleted: {
-        console.log("[ExpressionTextField] onCompleted", root.text)
         refreshStatus()
     }
 }

meshroom/ui/qml/Viewer/HdrImageToolbar.qml

@@ -112,8 +112,8 @@ FloatingPane {
                 ToolTip.text: "Reset Gain"
 
                 onClicked: {
-                    gainCtrl.value = gainDefaultValue
-                    gainLabel.reset(gainValue)
+                    gainLabel.text = gainDefaultValue
+                    gainCtrl.value = gainLabel.text
                 }
             }
             ExpressionTextField {
@@ -130,14 +130,11 @@ FloatingPane {
                 onAccepted: {
                     if (!gainLabel.hasExprError) {
                         if (gainLabel.text <= 0) {
-                            gainLabel.text = 0
-                            gainCtrl.value = gainLabel.text
+                            gainLabel.evaluatedValue = 0
+                            gainCtrl.value = gainLabel.evaluatedValue
                         } else {
-                            gainCtrl.value = Math.pow(Number(gainLabel.text), 1.0 / slidersPowerValue)
+                            gainCtrl.value = Math.pow(Number(gainLabel.evaluatedValue), 1.0 / slidersPowerValue)
                         }
-                    } else {
-                        // gainLabel.text = 0
-                        // gainCtrl.value = gainLabel.text
                     }
                 }
             }
@@ -148,7 +145,9 @@ FloatingPane {
                 to: 2
                 value: gainDefaultValue
                 stepSize: 0.01
-                onMoved: gainLabel.reset(Math.pow(value, slidersPowerValue))
+                onMoved: {
+                    gainLabel.text = Math.pow(value, slidersPowerValue).toFixed(2)
+                }
             }
         }
 
@@ -164,8 +163,8 @@ FloatingPane {
                 ToolTip.text: "Reset Gamma"
 
                 onClicked: {
-                    gammaCtrl.value = gammaDefaultValue;
-                    gammaLabel.reset(gammaValue)
+                    gammaLabel.text = gammaDefaultValue
+                    gammaCtrl.value = gammaLabel.text;
                 }
             }
             ExpressionTextField {
@@ -180,17 +179,13 @@ FloatingPane {
                 Layout.preferredWidth: textMetrics_gainValue.width
                 selectByMouse: true
                 onAccepted: {
-                    console.log("[GammaTextField] onAccepted")
                     if (!gammaLabel.hasExprError) {
                         if (gammaLabel.evaluatedValue <= 0) {
                             gammaLabel.evaluatedValue = 0
                             gammaCtrl.value = gammaLabel.evaluatedValue
                         } else {
                             gammaCtrl.value = Math.pow(Number(gammaLabel.evaluatedValue), 1.0 / slidersPowerValue)
                         }
-                    } else {
-                        // gammaLabel.evaluatedValue = 0
-                        // gammaCtrl.value = gainLabel.evaluatedValue
                     }
                 }
             }
@@ -201,7 +196,9 @@ FloatingPane {
                 to: 2
                 value: gammaDefaultValue
                 stepSize: 0.01
-                onMoved: gammaLabel.reset(Math.pow(value, slidersPowerValue))
+                onMoved: {
+                    gammaLabel.text = Math.pow(value, slidersPowerValue).toFixed(2)
+                }
             }
         }
 

meshroom/ui/reconstruction.py

@@ -1179,7 +1179,7 @@ def evaluateMathExpression(self, expr):
             res = mev.evaluate(expr)
             return [res, False]
         except Exception as err:
-            return [None, err]
+            return [None, True]
 
     selectedViewIdChanged = Signal()
     selectedViewId = Property(str, lambda self: self._selectedViewId, setSelectedViewId, notify=selectedViewIdChanged)