From ee75b9bdf5aa845994a734e660f698031f814384 Mon Sep 17 00:00:00 2001 From: Mark Date: Fri, 2 Feb 2018 10:28:37 +0100 Subject: [PATCH] Also accept a comma as input and convert it to a dot CURA-4910 --- plugins/MachineSettingsAction/MachineSettingsAction.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index 536c6c30d6..0aad716300 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -591,7 +591,7 @@ Cura.MachineAction const value = propertyProvider.properties.value; return value ? value : ""; } - validator: RegExpValidator { regExp: _allowNegative ? /-?[0-9\.]{0,6}/ : /[0-9\.]{0,6}/ } + validator: RegExpValidator { regExp: _allowNegative ? /-?[0-9\.,]{0,6}/ : /[0-9\.,]{0,6}/ } onEditingFinished: { if (propertyProvider && text != propertyProvider.properties.value) @@ -826,10 +826,10 @@ Cura.MachineAction printHeadPolygon[axis][side] = result; return result; } - validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } + validator: RegExpValidator { regExp: /[0-9\.,]{0,6}/ } onEditingFinished: { - printHeadPolygon[axis][side] = parseFloat(textField.text); + printHeadPolygon[axis][side] = parseFloat(textField.text.replace(',','.')); var polygon = []; polygon.push([-printHeadPolygon["x"]["min"], printHeadPolygon["y"]["max"]]); polygon.push([-printHeadPolygon["x"]["min"],-printHeadPolygon["y"]["min"]]);