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

Also accept a comma as input and convert it to a dot

Browse Source 
CURA-4910
This commit is contained in:
Mark 2018-02-02 10:28:37 +01:00
parent 6a053a9f46
commit ee75b9bdf5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -591,7 +591,7 @@ Cura.MachineAction
const value = propertyProvider.properties.value; const value = propertyProvider.properties.value;
return value ? 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: onEditingFinished:
{ {
if (propertyProvider && text != propertyProvider.properties.value) if (propertyProvider && text != propertyProvider.properties.value)
@ -826,10 +826,10 @@ Cura.MachineAction
printHeadPolygon[axis][side] = result; printHeadPolygon[axis][side] = result;
return result; return result;
} }
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ } validator: RegExpValidator { regExp: /[0-9\.,]{0,6}/ }
onEditingFinished: onEditingFinished:
{ {
printHeadPolygon[axis][side] = parseFloat(textField.text); printHeadPolygon[axis][side] = parseFloat(textField.text.replace(',','.'));
var polygon = []; var polygon = [];
polygon.push([-printHeadPolygon["x"]["min"], printHeadPolygon["y"]["max"]]); polygon.push([-printHeadPolygon["x"]["min"], printHeadPolygon["y"]["max"]]);
polygon.push([-printHeadPolygon["x"]["min"],-printHeadPolygon["y"]["min"]]); polygon.push([-printHeadPolygon["x"]["min"],-printHeadPolygon["y"]["min"]]);