Add ExpressionTextField component for float/int TextFields with expressions

Author: Alxiice

meshroom/core/desc/attribute.py

@@ -3,6 +3,7 @@
 import os
 import types
 from collections.abc import Iterable
+import math
 
 from meshroom.common import BaseObject, JSValue, Property, Variant, VariantList
 
@@ -341,7 +342,7 @@ def __init__(self, name, label, description, value, range=None, group="allParams
         self._valueType = int
 
     def validateValue(self, value):
-        if value is None:
+        if value is None or math.isnan(value):
             return value
         # Handle unsigned int values that are translated to int by shiboken and may overflow
         try:

meshroom/ui/qml/Controls/ExpressionTextField.qml

@@ -0,0 +1,49 @@
+import QtQuick
+import QtQuick.Controls
+
+TextField {
+    id: root
+
+    property bool hasExprError: false
+    property bool isInt: false          // If not then it's a float
+
+    signal expressionEditingFinished()
+    signal expressionAccepted()
+
+    // Overlay for error state
+    Rectangle {
+        anchors.fill: parent
+        radius: 4
+        border.color: "red"
+        color: "transparent"
+        visible: root.hasExprError || root.text == "NaN"
+        z: 1
+    }
+
+    function evalExpression() {
+        try {
+            if (root.text == "NaN") {
+                hasExprError = true
+                return
+            }
+            var result = MathEvaluator.eval(root.text)
+            if (isInt) {
+                result = parseInt(result)
+            }
+            root.text = result
+            hasExprError = false
+        } catch (err) {
+            console.error("Error evaluating expression (", root.text,"):", err)
+            hasExprError = true
+            root.text = "NaN"
+        }
+    }
+
+    onEditingFinished : {
+        evalExpression()
+    }
+
+    onAccepted : {
+        evalExpression()
+    }
+}

meshroom/ui/qml/Controls/mathEvaluator.js

@@ -0,0 +1,43 @@
+.pragma library
+
+
+var symbols = {
+    pi: Math.PI,
+    e: Math.E,
+    abs: Math.abs,
+    min: Math.min,
+    max: Math.max,
+    sin: Math.sin,
+    cos: Math.cos,
+    tan: Math.tan,
+    pow: Math.pow,
+    sqrt: Math.sqrt,
+    exp: Math.exp,
+    log: Math.log
+};
+
+
+/**
+ * Evaluate an expression
+ * 
+ * @param {*} expr Math expression
+ * @returns        float or int
+ */
+function eval(expr) {
+    // Replace symbols
+    for (var symbol in symbols) {
+        // Match each symbol only if they are at the beginning or end of the word
+        expr = expr.replace(new RegExp("\\b" + symbol + "\\b", "g"), symbols[symbol]);
+    }
+    
+    // Additionally replace the "," to "."
+    expr = expr.replace(',','.')
+    
+    // Only allow numbers, operators, parentheses, and function names
+    if (!/^[0-9+\-*/^().,\s]*$/.test(expr.replace(/\b[a-zA-Z]+\b/g, ""))) {
+        throw "Invalid characters in expression";
+    }
+
+    // Eval with function to avoid issues with undeclared variables
+    return Function('"use strict"; return (' + expr + ')')();
+}

meshroom/ui/qml/Controls/qmldir

@@ -1,5 +1,6 @@
 module Controls
 
+MathEvaluator 1.0 mathEvaluator.js
 ColorChart 1.0 ColorChart.qml
 ColorSelector 1.0 ColorSelector.qml
 ExpandableGroup 1.0 ExpandableGroup.qml
@@ -21,3 +22,4 @@ SelectionBox 1.0 SelectionBox.qml
 SelectionLine 1.0 SelectionLine.qml
 DelegateSelectionBox 1.0 DelegateSelectionBox.qml
 DelegateSelectionLine 1.0 DelegateSelectionLine.qml
+ExpressionTextField 1.0 ExpressionTextField.qml

meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml

@@ -605,14 +605,7 @@ RowLayout {
         Component {
             id: sliderComponent
             RowLayout {
-                TextField {
-                    IntValidator {
-                        id: intValidator
-                    }
-                    DoubleValidator {
-                        id: doubleValidator
-                        locale: 'C'  // Use '.' decimal separator disregarding the system locale
-                    }
+                ExpressionTextField {
                     implicitWidth: 100
                     Layout.fillWidth: !slider.active
                     enabled: root.editable
@@ -624,7 +617,7 @@ RowLayout {
                     // When the value change keep the text align to the left to be able to read the most important part
                     // of the number. When we are editing (item is in focus), the content should follow the editing.
                     autoScroll: activeFocus
-                    validator: attribute.type === "FloatParam" ? doubleValidator : intValidator
+                    isInt: attribute.type === "FloatParam" ? false : true
                     onEditingFinished: setTextFieldAttribute(text)
                     onAccepted: {
                         setTextFieldAttribute(text)

meshroom/ui/qml/Viewer/HdrImageToolbar.qml

@@ -114,7 +114,7 @@ FloatingPane {
                     gainCtrl.value = gainDefaultValue
                 }
             }
-            TextField {
+            ExpressionTextField {
                 id: gainLabel
 
                 ToolTip.visible: ToolTip.text && hovered
@@ -124,7 +124,6 @@ FloatingPane {
                 text: gainValue.toFixed(2)
                 Layout.preferredWidth: textMetrics_gainValue.width
                 selectByMouse: true
-                validator: doubleValidator
                 onAccepted: {
                     gainCtrl.value = Math.pow(Number(gainLabel.text), 1.0 / slidersPowerValue)
                 }
@@ -154,7 +153,7 @@ FloatingPane {
                     gammaCtrl.value = gammaDefaultValue;
                 }
             }
-            TextField {
+            ExpressionTextField {
                 id: gammaLabel
 
                 ToolTip.visible: ToolTip.text && hovered
@@ -164,7 +163,6 @@ FloatingPane {
                 text: gammaValue.toFixed(2)
                 Layout.preferredWidth: textMetrics_gainValue.width
                 selectByMouse: true
-                validator: doubleValidator
                 onAccepted: {
                     gammaCtrl.value = Math.pow(Number(gammaLabel.text), 1.0 / slidersPowerValue)
                 }