3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-09-09 00:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4

Browse source
This commit is contained in:
Jaime van Kessel 2016-12-19 13:05:12 +01:00
commit ccaca9d788
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/definitions/fdmprinter.def.json
View file

@ -3776,8 +3776,8 @@
"default_value": 200, "default_value": 200,
"minimum_value_warning": "-1000", "minimum_value_warning": "-1000",
"maximum_value_warning": "1000", "maximum_value_warning": "1000",
"maximum_value": "machine_width - 0.5 * resolveOrValue('prime_tower_size')", "maximum_value": "machine_width",
"minimum_value": "0.5 * resolveOrValue('prime_tower_size')", "minimum_value": "resolveOrValue('prime_tower_size')",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
}, },
@ -3791,8 +3791,8 @@
"default_value": 200, "default_value": 200,
"minimum_value_warning": "-1000", "minimum_value_warning": "-1000",
"maximum_value_warning": "1000", "maximum_value_warning": "1000",
"maximum_value": "machine_depth - 0.5 * resolveOrValue('prime_tower_size')", "maximum_value": "machine_depth - resolveOrValue('prime_tower_size')",
"minimum_value": "0.5 * resolveOrValue('prime_tower_size')", "minimum_value": "0",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
}, },

2
resources/qml/Settings/SettingTextField.qml
View file

@ -100,7 +100,7 @@ SettingItem
maximumLength: 10; maximumLength: 10;
validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]?[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry validator: RegExpValidator { regExp: (definition.type == "int") ? /^-?[0-9]{0,10}$/ : /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } // definition.type property from parent loader used to disallow fractional number entry
Binding Binding
{ {