3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 15:25:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'fix_machinesettings_floats' of https://github.com/fieldOfView/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2021-01-18 15:53:57 +01:00
commit ffccd687ac
No known key found for this signature in database
GPG key ID: 3710727397403C91
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View file

@ -156,12 +156,24 @@ UM.TooltipArea
const value = propertyProvider.properties.value
return value ? value : ""
}
validator: DoubleValidator
property string validatorString:
{
bottom: numericTextFieldWithUnit.minimum
top: numericTextFieldWithUnit.maximum
decimals: numericTextFieldWithUnit.decimals
notation: DoubleValidator.StandardNotation
var digits = Math.min(8, 1 + Math.floor(
Math.log(Math.max(Math.abs(numericTextFieldWithUnit.maximum), Math.abs(numericTextFieldWithUnit.minimum)))/Math.log(10)
))
var minus = numericTextFieldWithUnit.minimum < 0 ? "-?" : ""
if (numericTextFieldWithUnit.decimals == 0)
{
return "^%0\\d{1,%1}$".arg(minus).arg(digits)
}
else
{
return "^%0\\d{0,%1}[.,]?\\d{0,%2}$".arg(minus).arg(digits).arg(numericTextFieldWithUnit.decimals)
}
}
validator: RegExpValidator
{
regExp: new RegExp(textFieldWithUnit.validatorString)
}
//Enforce actual minimum and maximum values.