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

Allow setting negative values on extruder offset x/y fields

Browse Source
This commit is contained in:
fieldOfView 2017-05-16 13:54:45 +02:00
parent 85a29e967f
commit 910811810b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -341,7 +341,6 @@ Cura.MachineAction
sourceComponent: numericTextFieldWithUnit sourceComponent: numericTextFieldWithUnit
property var propertyProvider: gantryHeightProvider property var propertyProvider: gantryHeightProvider
property string unit: catalog.i18nc("@label", "mm") property string unit: catalog.i18nc("@label", "mm")
property bool forceUpdateOnChange: false
} }
Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height }
@ -385,7 +384,6 @@ Cura.MachineAction
sourceComponent: numericTextFieldWithUnit sourceComponent: numericTextFieldWithUnit
property var propertyProvider: materialDiameterProvider property var propertyProvider: materialDiameterProvider
property string unit: catalog.i18nc("@label", "mm") property string unit: catalog.i18nc("@label", "mm")
property bool forceUpdateOnChange: false
} }
Label Label
{ {
@ -399,7 +397,6 @@ Cura.MachineAction
sourceComponent: numericTextFieldWithUnit sourceComponent: numericTextFieldWithUnit
property var propertyProvider: machineNozzleSizeProvider property var propertyProvider: machineNozzleSizeProvider
property string unit: catalog.i18nc("@label", "mm") property string unit: catalog.i18nc("@label", "mm")
property bool forceUpdateOnChange: false
} }
} }
} }
@ -550,7 +547,6 @@ Cura.MachineAction
sourceComponent: numericTextFieldWithUnit sourceComponent: numericTextFieldWithUnit
property var propertyProvider: extruderNozzleSizeProvider property var propertyProvider: extruderNozzleSizeProvider
property string unit: catalog.i18nc("@label", "mm") property string unit: catalog.i18nc("@label", "mm")
property bool forceUpdateOnChange: false
} }
Label Label
@ -564,6 +560,7 @@ Cura.MachineAction
property var propertyProvider: extruderOffsetXProvider property var propertyProvider: extruderOffsetXProvider
property string unit: catalog.i18nc("@label", "mm") property string unit: catalog.i18nc("@label", "mm")
property bool forceUpdateOnChange: true property bool forceUpdateOnChange: true
property bool allowNegative: true
} }
Label Label
{ {
@ -576,6 +573,7 @@ Cura.MachineAction
property var propertyProvider: extruderOffsetYProvider property var propertyProvider: extruderOffsetYProvider
property string unit: catalog.i18nc("@label", "mm") property string unit: catalog.i18nc("@label", "mm")
property bool forceUpdateOnChange: true property bool forceUpdateOnChange: true
property bool allowNegative: true
} }
} }
@ -655,17 +653,21 @@ Cura.MachineAction
Item { Item {
height: textField.height height: textField.height
width: textField.width width: textField.width
property bool _allowNegative: (typeof(allowNegative) === 'undefined') ? false : allowNegative
property bool _forceUpdateOnChange: (typeof(forceUpdateOnChange) === 'undefined') ? false: forceUpdateOnChange
TextField TextField
{ {
id: textField id: textField
text: (propertyProvider.properties.value) ? propertyProvider.properties.value : "" text: (propertyProvider.properties.value) ? propertyProvider.properties.value : ""
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } validator: RegExpValidator { regExp: _allowNegative ? /-?[0-9\.]{0,6}/ : /[0-9\.]{0,6}/ }
onEditingFinished: onEditingFinished:
{ {
if (propertyProvider && text != propertyProvider.properties.value) if (propertyProvider && text != propertyProvider.properties.value)
{ {
propertyProvider.setPropertyValue("value", text); propertyProvider.setPropertyValue("value", text);
if(forceUpdateOnChange) if(_forceUpdateOnChange)
{ {
var extruderIndex = ExtruderManager.activeExtruderIndex; var extruderIndex = ExtruderManager.activeExtruderIndex;
manager.forceUpdate(); manager.forceUpdate();