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

Implement allowPositive for printhead settings

Browse Source 
CURA-6690
This commit is contained in:
Nino van Hooff 2019-09-19 14:49:18 +02:00
parent 17a832f52f
commit c43cdb5c63
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml
View File

@ -208,6 +208,7 @@ Item
axisName: "x" axisName: "x"
axisMinOrMax: "min" axisMinOrMax: "min"
allowNegativeValue: true allowNegativeValue: true
allowPositiveValue: false
forceUpdateOnChangeFunction: forceUpdateFunction forceUpdateOnChangeFunction: forceUpdateFunction
} }
@ -227,6 +228,7 @@ Item
axisName: "y" axisName: "y"
axisMinOrMax: "min" axisMinOrMax: "min"
allowNegativeValue: true allowNegativeValue: true
allowPositiveValue: false
forceUpdateOnChangeFunction: forceUpdateFunction forceUpdateOnChangeFunction: forceUpdateFunction
} }
@ -246,6 +248,7 @@ Item
axisName: "x" axisName: "x"
axisMinOrMax: "max" axisMinOrMax: "max"
allowNegativeValue: false allowNegativeValue: false
allowPositiveValue: true
forceUpdateOnChangeFunction: forceUpdateFunction forceUpdateOnChangeFunction: forceUpdateFunction
} }
@ -267,6 +270,7 @@ Item
axisName: "y" axisName: "y"
axisMinOrMax: "max" axisMinOrMax: "max"
allowNegativeValue: false allowNegativeValue: false
allowPositiveValue: true
forceUpdateOnChangeFunction: forceUpdateFunction forceUpdateOnChangeFunction: forceUpdateFunction
} }

2
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View File

@ -44,6 +44,8 @@ UM.TooltipArea
// whether negative value is allowed. This affects the validation of the input field. // whether negative value is allowed. This affects the validation of the input field.
property bool allowNegativeValue: false property bool allowNegativeValue: false
// whether positive value is allowed. This affects the validation of the input field.
property bool allowPositiveValue: true
// callback functions // callback functions
property var afterOnEditingFinishedFunction: dummy_func property var afterOnEditingFinishedFunction: dummy_func

2
resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml
View File

@ -48,9 +48,11 @@ NumericTextFieldWithUnit
valueValidator: DoubleValidator { valueValidator: DoubleValidator {
bottom: allowNegativeValue ? Number.NEGATIVE_INFINITY : 0 bottom: allowNegativeValue ? Number.NEGATIVE_INFINITY : 0
top: allowPositiveValue ? Number.POSITIVE_INFINITY : 0
decimals: 6 decimals: 6
notation: DoubleValidator.StandardNotation notation: DoubleValidator.StandardNotation
} }
valueText: axisValue valueText: axisValue
editingFinishedFunction: function() editingFinishedFunction: function()