Change global-only behaviour of some adhesion settings

They don't always work when set per-object. So don't allow it.

Contributes to issue CURA-458.
This commit is contained in:
Ghostkeeper 2016-02-15 15:30:52 +01:00
parent 4a862d0e0c
commit 4ccf4fe718

View file

@ -1532,7 +1532,8 @@
"brim": "Brim",
"raft": "Raft"
},
"default": "skirt"
"default": "skirt",
"global_only": "False"
},
"skirt_line_count": {
"label": "Skirt Line Count",
@ -1542,7 +1543,7 @@
"min_value": "0",
"max_value_warning": "10",
"enabled": "adhesion_type == \"skirt\"",
"global_only": "print_sequence != \"one_at_a_time\"",
"global_only": "False",
"visible": false
},
"skirt_gap": {
@ -1554,7 +1555,7 @@
"min_value_warning": "0",
"max_value_warning": "100",
"enabled": "adhesion_type == \"skirt\"",
"global_only": "print_sequence != \"one_at_a_time\"",
"global_only": "False",
"visible": false
},
"skirt_minimal_length": {
@ -1567,7 +1568,7 @@
"min_value_warning": "25",
"max_value_warning": "2500",
"enabled": "adhesion_type == \"skirt\"",
"global_only": "print_sequence != \"one_at_a_time\"",
"global_only": "False",
"visible": false
},
"brim_width": {
@ -1579,7 +1580,7 @@
"min_value": "0.0",
"max_value_warning": "100.0",
"enabled": "adhesion_type == \"brim\"",
"global_only": "print_sequence != \"one_at_a_time\"",
"global_only": "False",
"visible": true,
"children": {
"brim_line_count": {
@ -1591,7 +1592,7 @@
"max_value_warning": "300",
"inherit_function": "math.ceil(parent_value / skirt_line_width)",
"enabled": "adhesion_type == \"brim\"",
"global_only": "print_sequence != \"one_at_a_time\"",
"global_only": "False",
"visible": false
}
}
@ -1605,6 +1606,7 @@
"min_value_warning": "0",
"max_value_warning": "10",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_airgap": {
@ -1616,6 +1618,7 @@
"min_value": "0",
"max_value_warning": "1.0",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": true
},
"raft_surface_layers": {
@ -1626,6 +1629,7 @@
"min_value": "0",
"max_value_warning": "20",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": true
},
"raft_surface_thickness": {
@ -1637,6 +1641,7 @@
"min_value": "0",
"max_value_warning": "2.0",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_surface_line_width": {
@ -1648,6 +1653,7 @@
"min_value": "0.0001",
"max_value_warning": "machine_nozzle_size * 2",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_surface_line_spacing": {
@ -1660,6 +1666,7 @@
"max_value_warning": "5.0",
"enabled": "adhesion_type == \"raft\"",
"inherit_function": "raft_surface_line_width",
"global_only": "False",
"visible": false
},
"raft_interface_thickness": {
@ -1671,6 +1678,7 @@
"min_value": "0",
"max_value_warning": "5.0",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_interface_line_width": {
@ -1682,6 +1690,7 @@
"min_value": "0.0001",
"max_value_warning": "machine_nozzle_size * 2",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_interface_line_spacing": {
@ -1693,6 +1702,7 @@
"min_value": "0",
"max_value_warning": "15.0",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_base_thickness": {
@ -1704,6 +1714,7 @@
"min_value": "0",
"max_value_warning": "5.0",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_base_line_width": {
@ -1715,6 +1726,7 @@
"min_value": "0.0001",
"max_value_warning": "machine_nozzle_size * 2",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_base_line_spacing": {
@ -1726,6 +1738,7 @@
"min_value": "0.0001",
"max_value_warning": "100",
"enabled": "adhesion_type == \"raft\"",
"global_only": "False",
"visible": false
},
"raft_speed": {
@ -1738,6 +1751,7 @@
"max_value_warning": "200",
"enabled": "adhesion_type == \"raft\"",
"inherit_function": "speed_print / 60 * 30",
"global_only": "False",
"visible": false,
"children": {
"raft_surface_speed": {
@ -1750,6 +1764,7 @@
"max_value_warning": "100",
"enabled": "adhesion_type == \"raft\"",
"inherit_function": "parent_value",
"global_only": "False",
"visible": false
},
"raft_interface_speed": {
@ -1762,6 +1777,7 @@
"max_value_warning": "150",
"enabled": "adhesion_type == \"raft\"",
"inherit_function": "0.5 * parent_value",
"global_only": "False",
"visible": false
},
"raft_base_speed": {
@ -1774,6 +1790,7 @@
"max_value_warning": "200",
"enabled": "adhesion_type == \"raft\"",
"inherit_function": "0.5 * parent_value",
"global_only": "False",
"visible": false
}
}
@ -1786,6 +1803,7 @@
"min_value": "0",
"max_value": "100",
"default": 100,
"global_only": "False",
"visible": false,
"enabled": "adhesion_type == \"raft\"",
"children": {
@ -1797,6 +1815,7 @@
"min_value": "0",
"max_value": "100",
"default": 100,
"global_only": "False",
"visible": false,
"inherit": true,
"enabled": "adhesion_type == \"raft\""
@ -1809,6 +1828,7 @@
"min_value": "0",
"max_value": "100",
"default": 100,
"global_only": "False",
"visible": false,
"inherit": true,
"enabled": "adhesion_type == \"raft\""
@ -1821,6 +1841,7 @@
"min_value": "0",
"max_value": "100",
"default": 100,
"global_only": "False",
"visible": false,
"inherit": true,
"enabled": "adhesion_type == \"raft\""