GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-19 16:39:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add validator to material cost/weight spinboxes

Browse Source 
This way only valid numbers can be entered

CURA-8684
This commit is contained in:
casper 2022-01-31 15:18:58 +01:00
parent 14767a92c6
commit b2af6308e5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/Preferences/Materials/MaterialsView.qml
View File

@ -271,13 +271,14 @@ OldControls.TabView
text: spoolCostSpinBox.textFromValue(spoolCostSpinBox.value, spoolCostSpinBox.locale) text: spoolCostSpinBox.textFromValue(spoolCostSpinBox.value, spoolCostSpinBox.locale)
selectByMouse: true selectByMouse: true
background: Item {} background: Item {}
validator: RegExpValidator { regExp: new RegExp("^" + base.currency + " ([0-9]+[.]?[0-9]*)?$") }
} }
property int decimals: 2 property int decimals: 2
valueFromText: function(text) { valueFromText: function(text) {
// remove all non-number tokens from input string so value can be parsed correctly // remove all non-number tokens from input string so value can be parsed correctly
var value = Number(text.replace(",", ".").replace(/[^0-9.-]+/g, "")); var value = Number(text.replace(",", ".").replace(/[^0-9.]+/g, ""));
var precision = Math.pow(10, spoolCostSpinBox.decimals); var precision = Math.pow(10, spoolCostSpinBox.decimals);
return Math.round(value * precision) / precision; return Math.round(value * precision) / precision;
} }
@ -308,11 +309,12 @@ OldControls.TabView
text: spoolWeightSpinBox.textFromValue(spoolWeightSpinBox.value, spoolWeightSpinBox.locale) text: spoolWeightSpinBox.textFromValue(spoolWeightSpinBox.value, spoolWeightSpinBox.locale)
selectByMouse: true selectByMouse: true
background: Item {} background: Item {}
validator: RegExpValidator { regExp: new RegExp("^([0-9]+[.]?[0-9]*)? g$") }
} }
valueFromText: function(text, locale) { valueFromText: function(text, locale) {
// remove all non-number tokens from input string so value can be parsed correctly // remove all non-number tokens from input string so value can be parsed correctly
var value = Number(text.replace(",", ".").replace(/[^0-9.-]+/g, "")); var value = Number(text.replace(",", ".").replace(/[^0-9.]+/g, ""));
return Math.round(value); return Math.round(value);
} }