Move the infill pattern and infill overlap settings back as children of infill_density

This makes the inherit functions work properly
This commit is contained in:
Arjen Hiemstra 2015-10-15 01:04:32 +02:00
parent 769ff84c15
commit e42ffb23ca

View File

@ -455,32 +455,32 @@
"visible": false, "visible": false,
"inherit_function": "0 if parent_value == 0 else (infill_line_width * 100) / parent_value" "inherit_function": "0 if parent_value == 0 else (infill_line_width * 100) / parent_value"
} }
}
},
"infill_pattern": {
"label": "Infill Pattern",
"description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.",
"type": "enum",
"visible": false,
"options": {
"grid": "Grid",
"lines": "Lines",
"concentric": "Concentric",
"zigzag": "Zig Zag"
}, },
"default": "grid", "infill_pattern": {
"inherit_function": "'lines' if parent_value > 25 else 'grid'" "label": "Infill Pattern",
}, "description": "Cura defaults to switching between grid and line infill. But with this setting visible you can control this yourself. The line infill swaps direction on alternate layers of infill, while the grid prints the full cross-hatching on each layer of infill.",
"infill_overlap": { "type": "enum",
"label": "Infill Overlap", "visible": false,
"description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.", "options": {
"unit": "%", "grid": "Grid",
"type": "float", "lines": "Lines",
"default": 10, "concentric": "Concentric",
"min_value": "0", "zigzag": "Zig Zag"
"max_value": "100", },
"inherit_function": "10 if infill_sparse_density < 95 else 0", "default": "grid",
"visible": false "inherit_function": "'lines' if parent_value > 25 else 'grid'"
},
"infill_overlap": {
"label": "Infill Overlap",
"description": "The amount of overlap between the infill and the walls. A slight overlap allows the walls to connect firmly to the infill.",
"unit": "%",
"type": "float",
"default": 10,
"min_value": "0",
"max_value": "100",
"inherit_function": "10 if infill_sparse_density < 95 else 0",
"visible": false
}
}, },
"infill_wipe_dist": { "infill_wipe_dist": {
"label": "Infill Wipe Distance", "label": "Infill Wipe Distance",