GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 18:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature_extruder_per_feature'

Browse Source
This commit is contained in:
Ghostkeeper 2017-05-29 15:40:06 +02:00
commit 8ec9337077
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
4 changed files with 153 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/ConvexHullDecorator.py
View File

@ -298,7 +298,7 @@ class ConvexHullDecorator(SceneNodeDecorator):
self._onChanged() self._onChanged()
## Private convenience function to get a setting from the correct extruder (as defined by limit_to_extruder property). ## Private convenience function to get a setting from the correct extruder (as defined by limit_to_extruder property).
def _getSettingProperty(self, setting_key, property="value"): def _getSettingProperty(self, setting_key, property = "value"):
per_mesh_stack = self._node.callDecoration("getStack") per_mesh_stack = self._node.callDecoration("getStack")
if per_mesh_stack: if per_mesh_stack:
return per_mesh_stack.getProperty(setting_key, property) return per_mesh_stack.getProperty(setting_key, property)
@ -314,10 +314,8 @@ class ConvexHullDecorator(SceneNodeDecorator):
extruder_stack_id = ExtruderManager.getInstance().extruderIds["0"] extruder_stack_id = ExtruderManager.getInstance().extruderIds["0"]
extruder_stack = ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0] extruder_stack = ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0]
return extruder_stack.getProperty(setting_key, property) return extruder_stack.getProperty(setting_key, property)
else: #Limit_to_extruder is set. Use that one. else: #Limit_to_extruder is set. The global stack handles this then.
extruder_stack_id = ExtruderManager.getInstance().extruderIds[str(extruder_index)] return self._global_stack.getProperty(setting_key, property)
stack = ContainerRegistry.getInstance().findContainerStacks(id = extruder_stack_id)[0]
return stack.getProperty(setting_key, property)
## Returns true if node is a descendant or the same as the root node. ## Returns true if node is a descendant or the same as the root node.
def __isDescendant(self, root, node): def __isDescendant(self, root, node):

9
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -94,6 +94,8 @@ Item {
return settingComboBox return settingComboBox
case "extruder": case "extruder":
return settingExtruder return settingExtruder
case "optional_extruder":
return settingOptionalExtruder
case "bool": case "bool":
return settingCheckBox return settingCheckBox
case "str": case "str":
@ -342,6 +344,13 @@ Item {
Cura.SettingExtruder { } Cura.SettingExtruder { }
} }
Component
{
id: settingOptionalExtruder
Cura.SettingOptionalExtruder { }
}
Component Component
{ {
id: settingCheckBox; id: settingCheckBox;

144
resources/definitions/fdmprinter.def.json
View File

@ -655,6 +655,7 @@
"value": "line_width", "value": "line_width",
"default_value": 0.4, "default_value": 0.4,
"type": "float", "type": "float",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -669,6 +670,7 @@
"default_value": 0.4, "default_value": 0.4,
"value": "wall_line_width", "value": "wall_line_width",
"type": "float", "type": "float",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"wall_line_width_x": "wall_line_width_x":
@ -682,6 +684,7 @@
"default_value": 0.4, "default_value": 0.4,
"value": "wall_line_width", "value": "wall_line_width",
"type": "float", "type": "float",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -697,6 +700,7 @@
"default_value": 0.4, "default_value": 0.4,
"type": "float", "type": "float",
"value": "line_width", "value": "line_width",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"infill_line_width": "infill_line_width":
@ -711,6 +715,7 @@
"type": "float", "type": "float",
"value": "line_width", "value": "line_width",
"enabled": "infill_sparse_density > 0", "enabled": "infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"skirt_brim_line_width": "skirt_brim_line_width":
@ -822,6 +827,45 @@
"type": "category", "type": "category",
"children": "children":
{ {
"wall_extruder_nr":
{
"label": "Wall Extruder",
"description": "The extruder train used for printing the walls. This is used in multi-extrusion.",
"type": "optional_extruder",
"default_value": "-1",
"value": "-1",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": true,
"settable_globally": true,
"children":
{
"wall_0_extruder_nr":
{
"label": "Outer Wall Extruder",
"description": "The extruder train used for printing the outer wall. This is used in multi-extrusion.",
"type": "optional_extruder",
"default_value": "-1",
"value": "wall_extruder_nr",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": true,
"settable_globally": true
},
"wall_x_extruder_nr":
{
"label": "Inner Walls Extruder",
"description": "The extruder train used for printing the inner walls. This is used in multi-extrusion.",
"type": "optional_extruder",
"default_value": "-1",
"value": "wall_extruder_nr",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": true,
"settable_globally": true
}
}
},
"wall_thickness": "wall_thickness":
{ {
"label": "Wall Thickness", "label": "Wall Thickness",
@ -832,6 +876,7 @@
"minimum_value_warning": "line_width", "minimum_value_warning": "line_width",
"maximum_value_warning": "10 * line_width", "maximum_value_warning": "10 * line_width",
"type": "float", "type": "float",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -845,6 +890,7 @@
"maximum_value_warning": "10", "maximum_value_warning": "10",
"type": "int", "type": "int",
"value": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0", "value": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -859,8 +905,21 @@
"value": "machine_nozzle_size / 2", "value": "machine_nozzle_size / 2",
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "machine_nozzle_size", "maximum_value_warning": "machine_nozzle_size",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"top_bottom_extruder_nr":
{
"label": "Top/Bottom Extruder",
"description": "The extruder train used for printing the top and bottom skin. This is used in multi-extrusion.",
"type": "optional_extruder",
"default_value": "-1",
"value": "-1",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": true,
"settable_globally": true
},
"top_bottom_thickness": "top_bottom_thickness":
{ {
"label": "Top/Bottom Thickness", "label": "Top/Bottom Thickness",
@ -871,6 +930,7 @@
"minimum_value_warning": "0.6", "minimum_value_warning": "0.6",
"maximum_value": "machine_height", "maximum_value": "machine_height",
"type": "float", "type": "float",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -885,6 +945,7 @@
"maximum_value": "machine_height", "maximum_value": "machine_height",
"type": "float", "type": "float",
"value": "top_bottom_thickness", "value": "top_bottom_thickness",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -898,6 +959,7 @@
"type": "int", "type": "int",
"minimum_value_warning": "2", "minimum_value_warning": "2",
"value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))", "value": "0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -913,6 +975,7 @@
"type": "float", "type": "float",
"value": "top_bottom_thickness", "value": "top_bottom_thickness",
"maximum_value": "machine_height", "maximum_value": "machine_height",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -925,6 +988,7 @@
"default_value": 6, "default_value": 6,
"type": "int", "type": "int",
"value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))", "value": "999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -943,6 +1007,7 @@
"zigzag": "Zig Zag" "zigzag": "Zig Zag"
}, },
"default_value": "lines", "default_value": "lines",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"top_bottom_pattern_0": "top_bottom_pattern_0":
@ -958,6 +1023,7 @@
}, },
"default_value": "lines", "default_value": "lines",
"value": "top_bottom_pattern", "value": "top_bottom_pattern",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"skin_angles": "skin_angles":
@ -967,6 +1033,7 @@
"type": "[int]", "type": "[int]",
"default_value": "[ ]", "default_value": "[ ]",
"enabled": "top_bottom_pattern != 'concentric'", "enabled": "top_bottom_pattern != 'concentric'",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"wall_0_inset": "wall_0_inset":
@ -979,6 +1046,7 @@
"value": "(machine_nozzle_size - wall_line_width_0) / 2 if (wall_line_width_0 < machine_nozzle_size and not outer_inset_first) else 0", "value": "(machine_nozzle_size - wall_line_width_0) / 2 if (wall_line_width_0 < machine_nozzle_size and not outer_inset_first) else 0",
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "machine_nozzle_size", "maximum_value_warning": "machine_nozzle_size",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"outer_inset_first": "outer_inset_first":
@ -987,6 +1055,7 @@
"description": "Prints walls in order of outside to inside when enabled. This can help improve dimensional accuracy in X and Y when using a high viscosity plastic like ABS; however it can decrease outer surface print quality, especially on overhangs.", "description": "Prints walls in order of outside to inside when enabled. This can help improve dimensional accuracy in X and Y when using a high viscosity plastic like ABS; however it can decrease outer surface print quality, especially on overhangs.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"enabled": "wall_0_extruder_nr == wall_x_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"alternate_extra_perimeter": "alternate_extra_perimeter":
@ -995,6 +1064,7 @@
"description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.", "description": "Prints an extra wall at every other layer. This way infill gets caught between these extra walls, resulting in stronger prints.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"travel_compensate_overlapping_walls_enabled": "travel_compensate_overlapping_walls_enabled":
@ -1003,6 +1073,7 @@
"description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.", "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.",
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -1013,6 +1084,7 @@
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"value": "travel_compensate_overlapping_walls_enabled", "value": "travel_compensate_overlapping_walls_enabled",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"travel_compensate_overlapping_walls_x_enabled": "travel_compensate_overlapping_walls_x_enabled":
@ -1022,6 +1094,7 @@
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"value": "travel_compensate_overlapping_walls_enabled", "value": "travel_compensate_overlapping_walls_enabled",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -1035,6 +1108,7 @@
"everywhere": "Everywhere" "everywhere": "Everywhere"
}, },
"default_value": "everywhere", "default_value": "everywhere",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"xy_offset": "xy_offset":
@ -1046,6 +1120,7 @@
"minimum_value_warning": "-1", "minimum_value_warning": "-1",
"maximum_value_warning": "1", "maximum_value_warning": "1",
"default_value": 0, "default_value": 0,
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"z_seam_type": "z_seam_type":
@ -1060,6 +1135,7 @@
"random": "Random" "random": "Random"
}, },
"default_value": "shortest", "default_value": "shortest",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"z_seam_x": "z_seam_x":
@ -1071,6 +1147,7 @@
"default_value": 100.0, "default_value": 100.0,
"value": "machine_width / 2", "value": "machine_width / 2",
"enabled": "z_seam_type == 'back'", "enabled": "z_seam_type == 'back'",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"z_seam_y": "z_seam_y":
@ -1082,6 +1159,7 @@
"default_value": 100.0, "default_value": 100.0,
"value": "machine_depth * 3", "value": "machine_depth * 3",
"enabled": "z_seam_type == 'back'", "enabled": "z_seam_type == 'back'",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"skin_no_small_gaps_heuristic": "skin_no_small_gaps_heuristic":
@ -1090,6 +1168,7 @@
"description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting.", "description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting.",
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -1102,6 +1181,18 @@
"type": "category", "type": "category",
"children": "children":
{ {
"infill_extruder_nr":
{
"label": "Infill Extruder",
"description": "The extruder train used for printing infill. This is used in multi-extrusion.",
"type": "optional_extruder",
"default_value": "-1",
"value": "-1",
"settable_per_mesh": true,
"settable_per_extruder": false,
"settable_per_meshgroup": true,
"settable_globally": true
},
"infill_sparse_density": "infill_sparse_density":
{ {
"label": "Infill Density", "label": "Infill Density",
@ -1111,6 +1202,7 @@
"default_value": 20, "default_value": 20,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "100", "maximum_value_warning": "100",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -1124,6 +1216,7 @@
"minimum_value": "0", "minimum_value": "0",
"minimum_value_warning": "infill_line_width", "minimum_value_warning": "infill_line_width",
"value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' else 1)))", "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' else 1)))",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -1148,6 +1241,7 @@
"default_value": "grid", "default_value": "grid",
"enabled": "infill_sparse_density > 0", "enabled": "infill_sparse_density > 0",
"value": "'lines' if infill_sparse_density > 25 else 'grid'", "value": "'lines' if infill_sparse_density > 25 else 'grid'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"infill_angles": "infill_angles":
@ -1156,7 +1250,8 @@
"description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns).", "description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns).",
"type": "[int]", "type": "[int]",
"default_value": "[ ]", "default_value": "[ ]",
"enabled": "infill_pattern != 'concentric' and infill_pattern != 'concentric_3d' and infill_pattern != 'cubicsubdiv'", "enabled": "infill_pattern != 'concentric' and infill_pattern != 'concentric_3d' and infill_pattern != 'cubicsubdiv' and infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"spaghetti_infill_enabled": "spaghetti_infill_enabled":
@ -1166,6 +1261,7 @@
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"enabled": "infill_sparse_density > 0", "enabled": "infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"spaghetti_max_infill_angle": "spaghetti_max_infill_angle":
@ -1179,6 +1275,7 @@
"maximum_value": "90", "maximum_value": "90",
"maximum_value_warning": "45", "maximum_value_warning": "45",
"enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled", "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"spaghetti_max_height": "spaghetti_max_height":
@ -1191,6 +1288,7 @@
"minimum_value": "layer_height", "minimum_value": "layer_height",
"maximum_value_warning": "10.0", "maximum_value_warning": "10.0",
"enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled", "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"spaghetti_inset": "spaghetti_inset":
@ -1203,6 +1301,7 @@
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "5.0", "maximum_value_warning": "5.0",
"enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled", "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"spaghetti_flow": "spaghetti_flow":
@ -1215,6 +1314,7 @@
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "100", "maximum_value_warning": "100",
"enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled", "enabled": "infill_sparse_density > 0 and spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"sub_div_rad_add": "sub_div_rad_add":
@ -1228,6 +1328,7 @@
"minimum_value_warning": "-1 * infill_line_distance", "minimum_value_warning": "-1 * infill_line_distance",
"maximum_value_warning": "5 * infill_line_distance", "maximum_value_warning": "5 * infill_line_distance",
"enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'", "enabled": "infill_sparse_density > 0 and infill_pattern == 'cubicsubdiv'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"infill_overlap": "infill_overlap":
@ -1241,6 +1342,7 @@
"minimum_value_warning": "-50", "minimum_value_warning": "-50",
"maximum_value_warning": "100", "maximum_value_warning": "100",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'concentric'", "enabled": "infill_sparse_density > 0 and infill_pattern != 'concentric'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -1253,7 +1355,7 @@
"default_value": 0.04, "default_value": 0.04,
"minimum_value_warning": "-0.5 * machine_nozzle_size", "minimum_value_warning": "-0.5 * machine_nozzle_size",
"maximum_value_warning": "machine_nozzle_size", "maximum_value_warning": "machine_nozzle_size",
"value": "infill_line_width * infill_overlap / 100 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", "value": "0.5 * ( infill_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0) ) * infill_overlap / 100 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'concentric'", "enabled": "infill_sparse_density > 0 and infill_pattern != 'concentric'",
"settable_per_mesh": true "settable_per_mesh": true
} }
@ -1270,6 +1372,7 @@
"maximum_value_warning": "100", "maximum_value_warning": "100",
"value": "5 if top_bottom_pattern != 'concentric' else 0", "value": "5 if top_bottom_pattern != 'concentric' else 0",
"enabled": "top_bottom_pattern != 'concentric'", "enabled": "top_bottom_pattern != 'concentric'",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -1282,7 +1385,7 @@
"default_value": 0.02, "default_value": 0.02,
"minimum_value_warning": "-0.5 * machine_nozzle_size", "minimum_value_warning": "-0.5 * machine_nozzle_size",
"maximum_value_warning": "machine_nozzle_size", "maximum_value_warning": "machine_nozzle_size",
"value": "skin_line_width * skin_overlap / 100 if top_bottom_pattern != 'concentric' else 0", "value": "0.5 * ( skin_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0) ) * skin_overlap / 100 if top_bottom_pattern != 'concentric' else 0",
"enabled": "top_bottom_pattern != 'concentric'", "enabled": "top_bottom_pattern != 'concentric'",
"settable_per_mesh": true "settable_per_mesh": true
} }
@ -1299,6 +1402,7 @@
"minimum_value_warning": "0", "minimum_value_warning": "0",
"maximum_value_warning": "machine_nozzle_size", "maximum_value_warning": "machine_nozzle_size",
"enabled": "infill_sparse_density > 0", "enabled": "infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"infill_sparse_thickness": "infill_sparse_thickness":
@ -1313,6 +1417,7 @@
"maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8)", "maximum_value": "resolveOrValue('layer_height') * (1.45 if spaghetti_infill_enabled else 8)",
"value": "resolveOrValue('layer_height')", "value": "resolveOrValue('layer_height')",
"enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled", "enabled": "infill_sparse_density > 0 and not spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"gradual_infill_steps": "gradual_infill_steps":
@ -1325,6 +1430,7 @@
"maximum_value_warning": "5", "maximum_value_warning": "5",
"maximum_value": "0 if spaghetti_infill_enabled else (999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2)))", "maximum_value": "0 if spaghetti_infill_enabled else (999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2)))",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' and not spaghetti_infill_enabled", "enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv' and not spaghetti_infill_enabled",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"gradual_infill_step_height": "gradual_infill_step_height":
@ -1338,6 +1444,7 @@
"minimum_value_warning": "3 * resolveOrValue('layer_height')", "minimum_value_warning": "3 * resolveOrValue('layer_height')",
"maximum_value_warning": "100", "maximum_value_warning": "100",
"enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'", "enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"infill_before_walls": "infill_before_walls":
@ -1346,7 +1453,7 @@
"description": "Print the infill before printing the walls. Printing the walls first may lead to more accurate walls, but overhangs print worse. Printing the infill first leads to sturdier walls, but the infill pattern might sometimes show through the surface.", "description": "Print the infill before printing the walls. Printing the walls first may lead to more accurate walls, but overhangs print worse. Printing the infill first leads to sturdier walls, but the infill pattern might sometimes show through the surface.",
"type": "bool", "type": "bool",
"default_value": true, "default_value": true,
"enabled": "infill_sparse_density > 0", "enabled": "infill_sparse_density > 0 and wall_extruder_nr == infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"min_infill_area": "min_infill_area":
@ -1357,6 +1464,7 @@
"type": "float", "type": "float",
"minimum_value": "0", "minimum_value": "0",
"default_value": 0, "default_value": 0,
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"expand_skins_into_infill": "expand_skins_into_infill":
@ -1365,6 +1473,7 @@
"description": "Expand skin areas of top and/or bottom skin of flat surfaces. By default, skins stop under the wall lines that surround infill but this can lead to holes appearing when the infill density is low. This setting extends the skins beyond the wall lines so that the infill on the next layer rests on skin.", "description": "Expand skin areas of top and/or bottom skin of flat surfaces. By default, skins stop under the wall lines that surround infill but this can lead to holes appearing when the infill density is low. This setting extends the skins beyond the wall lines so that the infill on the next layer rests on skin.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -1375,6 +1484,7 @@
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"value": "expand_skins_into_infill", "value": "expand_skins_into_infill",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"expand_lower_skins": "expand_lower_skins":
@ -1383,6 +1493,7 @@
"description": "Expand the bottom skin areas (areas with air below) so that they are anchored by the infill layers above and below.", "description": "Expand the bottom skin areas (areas with air below) so that they are anchored by the infill layers above and below.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -1397,6 +1508,7 @@
"value": "infill_line_distance * 1.4", "value": "infill_line_distance * 1.4",
"minimum_value": "0", "minimum_value": "0",
"enabled": "expand_upper_skins or expand_lower_skins", "enabled": "expand_upper_skins or expand_lower_skins",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"max_skin_angle_for_expansion": "max_skin_angle_for_expansion":
@ -1411,6 +1523,7 @@
"maximum_value": "90", "maximum_value": "90",
"default_value": 20, "default_value": 20,
"enabled": "expand_upper_skins or expand_lower_skins", "enabled": "expand_upper_skins or expand_lower_skins",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -1424,6 +1537,7 @@
"value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))", "value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))",
"minimum_value": "0", "minimum_value": "0",
"enabled": "expand_upper_skins or expand_lower_skins", "enabled": "expand_upper_skins or expand_lower_skins",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -1852,6 +1966,7 @@
"default_value": 60, "default_value": 60,
"value": "speed_print", "value": "speed_print",
"enabled": "infill_sparse_density > 0", "enabled": "infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"speed_wall": "speed_wall":
@ -1865,6 +1980,7 @@
"maximum_value_warning": "150", "maximum_value_warning": "150",
"default_value": 30, "default_value": 30,
"value": "speed_print / 2", "value": "speed_print / 2",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -1879,6 +1995,7 @@
"maximum_value_warning": "150", "maximum_value_warning": "150",
"default_value": 30, "default_value": 30,
"value": "speed_wall", "value": "speed_wall",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"speed_wall_x": "speed_wall_x":
@ -1892,6 +2009,7 @@
"maximum_value_warning": "150", "maximum_value_warning": "150",
"default_value": 60, "default_value": 60,
"value": "speed_wall * 2", "value": "speed_wall * 2",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -1907,6 +2025,7 @@
"maximum_value_warning": "150", "maximum_value_warning": "150",
"default_value": 30, "default_value": 30,
"value": "speed_print / 2", "value": "speed_print / 2",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"speed_support": "speed_support":
@ -2169,6 +2288,7 @@
"default_value": 3000, "default_value": 3000,
"value": "acceleration_print", "value": "acceleration_print",
"enabled": "resolveOrValue('acceleration_enabled') and infill_sparse_density > 0", "enabled": "resolveOrValue('acceleration_enabled') and infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"acceleration_wall": "acceleration_wall":
@ -2183,6 +2303,7 @@
"default_value": 3000, "default_value": 3000,
"value": "acceleration_print", "value": "acceleration_print",
"enabled": "resolveOrValue('acceleration_enabled')", "enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -2198,6 +2319,7 @@
"default_value": 3000, "default_value": 3000,
"value": "acceleration_wall", "value": "acceleration_wall",
"enabled": "resolveOrValue('acceleration_enabled')", "enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"acceleration_wall_x": "acceleration_wall_x":
@ -2212,6 +2334,7 @@
"default_value": 3000, "default_value": 3000,
"value": "acceleration_wall", "value": "acceleration_wall",
"enabled": "resolveOrValue('acceleration_enabled')", "enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -2228,6 +2351,7 @@
"default_value": 3000, "default_value": 3000,
"value": "acceleration_print", "value": "acceleration_print",
"enabled": "resolveOrValue('acceleration_enabled')", "enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"acceleration_support": "acceleration_support":
@ -2441,6 +2565,7 @@
"default_value": 20, "default_value": 20,
"value": "jerk_print", "value": "jerk_print",
"enabled": "resolveOrValue('jerk_enabled') and infill_sparse_density > 0", "enabled": "resolveOrValue('jerk_enabled') and infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"jerk_wall": "jerk_wall":
@ -2454,6 +2579,7 @@
"default_value": 20, "default_value": 20,
"value": "jerk_print", "value": "jerk_print",
"enabled": "resolveOrValue('jerk_enabled')", "enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -2468,6 +2594,7 @@
"default_value": 20, "default_value": 20,
"value": "jerk_wall", "value": "jerk_wall",
"enabled": "resolveOrValue('jerk_enabled')", "enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"jerk_wall_x": "jerk_wall_x":
@ -2481,6 +2608,7 @@
"default_value": 20, "default_value": 20,
"value": "jerk_wall", "value": "jerk_wall",
"enabled": "resolveOrValue('jerk_enabled')", "enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }
@ -2496,6 +2624,7 @@
"default_value": 20, "default_value": 20,
"value": "jerk_print", "value": "jerk_print",
"enabled": "resolveOrValue('jerk_enabled')", "enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"jerk_support": "jerk_support":
@ -4399,6 +4528,7 @@
"default_value": 0.15, "default_value": 0.15,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "1.0", "maximum_value_warning": "1.0",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"carve_multiple_volumes": "carve_multiple_volumes":
@ -4736,6 +4866,7 @@
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "10", "maximum_value_warning": "10",
"type": "int", "type": "int",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"skin_alternate_rotation": "skin_alternate_rotation":
@ -4745,6 +4876,7 @@
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"enabled": "top_bottom_pattern != 'concentric'", "enabled": "top_bottom_pattern != 'concentric'",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"support_conical_enabled": "support_conical_enabled":
@ -4800,6 +4932,7 @@
"description": "Randomly jitter while printing the outer wall, so that the surface has a rough and fuzzy look.", "description": "Randomly jitter while printing the outer wall, so that the surface has a rough and fuzzy look.",
"type": "bool", "type": "bool",
"default_value": false, "default_value": false,
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"magic_fuzzy_skin_thickness": "magic_fuzzy_skin_thickness":
@ -4812,6 +4945,7 @@
"minimum_value": "0.001", "minimum_value": "0.001",
"maximum_value_warning": "wall_line_width_0", "maximum_value_warning": "wall_line_width_0",
"enabled": "magic_fuzzy_skin_enabled", "enabled": "magic_fuzzy_skin_enabled",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
}, },
"magic_fuzzy_skin_point_density": "magic_fuzzy_skin_point_density":
@ -4826,6 +4960,7 @@
"maximum_value_warning": "10", "maximum_value_warning": "10",
"maximum_value": "2 / magic_fuzzy_skin_thickness", "maximum_value": "2 / magic_fuzzy_skin_thickness",
"enabled": "magic_fuzzy_skin_enabled", "enabled": "magic_fuzzy_skin_enabled",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true, "settable_per_mesh": true,
"children": "children":
{ {
@ -4841,6 +4976,7 @@
"maximum_value_warning": "10", "maximum_value_warning": "10",
"value": "10000 if magic_fuzzy_skin_point_density == 0 else 1 / magic_fuzzy_skin_point_density", "value": "10000 if magic_fuzzy_skin_point_density == 0 else 1 / magic_fuzzy_skin_point_density",
"enabled": "magic_fuzzy_skin_enabled", "enabled": "magic_fuzzy_skin_enabled",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true "settable_per_mesh": true
} }
} }

2
resources/qml/Settings/SettingItem.qml
View File

@ -140,7 +140,7 @@ Item {
{ {
id: linkedSettingIcon; id: linkedSettingIcon;
visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || definition.limit_to_extruder != "-1") && base.showLinkedSettingIcon visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || globalPropertyProvider.properties.limit_to_extruder != "-1") && base.showLinkedSettingIcon
height: parent.height; height: parent.height;
width: height; width: height;