Browse Source

Implement allowPositive for printhead settings

CURA-6690
Nino van Hooff 5 years ago
parent
commit
c43cdb5c63

+ 4 - 0
plugins/MachineSettingsAction/MachineSettingsPrinterTab.qml

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

+ 2 - 0
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml

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

+ 2 - 0
resources/qml/MachineSettings/PrintHeadMinMaxTextField.qml

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