Skip to content

Fix the value validation for Int/Float attributes with expressions #2885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 12, 2025
Merged

Fix the value validation for Int/Float attributes with expressions #2885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8982a
[attributes] ExpressionTextFields: error on vaidateValue when we pass…
Alxiice Sep 12, 2025
afe02f3
[attribute] Simplify value validation on int/float
Alxiice Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meshroom/core/desc/attribute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def __init__(self, name, label, description, value, range=None, group="allParams
self._valueType = int

def validateValue(self, value):
if value is None or isinstance(value, str):
if value is None:
return value
# Handle unsigned int values that are translated to int by shiboken and may overflow
try:
Expand Down Expand Up @@ -371,7 +371,7 @@ def __init__(self, name, label, description, value, range=None, group="allParams
self._valueType = float

def validateValue(self, value):
if value is None or isinstance(value, str):
if value is None:
return value
try:
return float(value)
Expand Down
15 changes: 4 additions & 11 deletions meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ RowLayout {
case "IntParam":
case "FloatParam":
// We don't set a number because we want to keep the invalid expression
// _reconstruction.setAttribute(root.attribute, Number(value))
_reconstruction.setAttribute(root.attribute, value)
_reconstruction.setAttribute(root.attribute, Number(value))
updateAttributeLabel()
break
case "File":
Expand Down Expand Up @@ -623,15 +622,11 @@ RowLayout {
isInt: attribute.type === "FloatParam" ? false : true

onEditingFinished: {
if (hasExprError)
setTextFieldAttribute(expressionTextField.text) // On the undo stack we keep the expression
else
if (!hasExprError)
setTextFieldAttribute(expressionTextField.evaluatedValue)
}
onAccepted: {
if (hasExprError)
setTextFieldAttribute(expressionTextField.text) // On the undo stack we keep the expression
else
if (!hasExprError)
setTextFieldAttribute(expressionTextField.evaluatedValue)
// When the text is too long, display the left part
// (with the most important values and cut the floating point details)
Expand All @@ -640,9 +635,7 @@ RowLayout {

Component.onDestruction: {
if (activeFocus) {
if (hasExprError)
setTextFieldAttribute(expressionTextField.text)
else
if (!hasExprError)
setTextFieldAttribute(expressionTextField.evaluatedValue)
}
}
Expand Down
Loading