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

Merge branch 'bugfix_global_inherits_stack' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2016-09-12 14:52:11 +02:00
commit cd56f22321
1 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,8 +630,7 @@
"value": "line_width",
"enabled": "adhesion_type == \"skirt\" or adhesion_type == \"brim\"",
"settable_per_mesh": false,
"settable_per_extruder": true,
"global_inherits_stack": "adhesion_extruder_nr"
"settable_per_extruder": true
},
"support_line_width":
{
@ -645,6 +644,7 @@
"type": "float",
"enabled": "support_enable",
"value": "line_width",
"global_inherits_stack": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -657,7 +657,8 @@
"minimum_value": "0.0001",
"maximum_value_warning": "machine_nozzle_size * 2",
"type": "float",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable')",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable')",
"global_inherits_stack": "support_interface_extruder_nr",
"value": "line_width",
"settable_per_mesh": false,
"settable_per_extruder": true
@ -1487,7 +1488,7 @@
"minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "150",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"value": "speed_support / 1.5",
"settable_per_mesh": false,
"settable_per_extruder": true
@ -1755,7 +1756,7 @@
"minimum_value": "0.1",
"minimum_value_warning": "100",
"maximum_value_warning": "10000",
"enabled": "acceleration_enabled and extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"enabled": "acceleration_enabled and extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": false,
"settable_per_extruder": true
}
@ -1975,7 +1976,7 @@
"minimum_value": "0.1",
"minimum_value_warning": "5",
"maximum_value_warning": "50",
"enabled": "jerk_enabled and extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"enabled": "jerk_enabled and extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": false,
"settable_per_extruder": true
}
@ -2295,7 +2296,7 @@
"minimum_value": "0",
"maximum_value": "90",
"default_value": 50,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2314,7 +2315,7 @@
},
"default_value": "zigzag",
"enabled": "support_enable",
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -2325,6 +2326,7 @@
"type": "bool",
"default_value": true,
"enabled": "support_enable and (support_pattern == 'zigzag')",
"global_inherits_stack": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -2338,6 +2340,7 @@
"maximum_value_warning": "100",
"default_value": 15,
"enabled": "support_enable",
"global_inherits_stack": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true,
"children": {
@ -2351,6 +2354,7 @@
"default_value": 2.66,
"enabled": "support_enable",
"value": "(support_line_width * 100) / support_infill_rate * (2 if support_pattern == \"grid\" else (3 if support_pattern == \"triangles\" else 1))",
"global_inherits_stack": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true
}
@ -2365,7 +2369,7 @@
"minimum_value": "0",
"maximum_value_warning": "10",
"default_value": 0.1,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true,
"children":
@ -2381,7 +2385,7 @@
"type": "float",
"enabled": "support_enable",
"value": "extruderValue(support_extruder_nr, 'support_z_distance')",
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
"settable_per_mesh": true
},
"support_bottom_distance":
@ -2393,7 +2397,7 @@
"maximum_value_warning": "10",
"default_value": 0.1,
"value": "extruderValue(support_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0",
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
"type": "float",
"enabled": "support_enable and support_type == 'everywhere'",
"settable_per_mesh": true
@ -2409,7 +2413,7 @@
"minimum_value": "0",
"maximum_value_warning": "10",
"default_value": 0.7,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2422,7 +2426,7 @@
"z_overrides_xy": "Z overrides X/Y"
},
"default_value": "z_overrides_xy",
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2435,8 +2439,8 @@
"maximum_value_warning": "10",
"default_value": 0.2,
"value": "machine_nozzle_size / 2",
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable and extruderValue(support_extruder_nr, 'support_xy_overrides_z') == 'z_overrides_xy'",
"global_inherits_stack": "support_infill_extruder_nr",
"enabled": "support_enable and extruderValue(support_infill_extruder_nr, 'support_xy_overrides_z') == 'z_overrides_xy'",
"settable_per_mesh": true
},
"support_bottom_stair_step_height":
@ -2446,7 +2450,7 @@
"unit": "mm",
"type": "float",
"default_value": 0.3,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
"minimum_value": "0",
"maximum_value_warning": "1.0",
"enabled": "support_enable",
@ -2459,7 +2463,7 @@
"unit": "mm",
"type": "float",
"default_value": 2.0,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"minimum_value_warning": "0",
"maximum_value_warning": "10",
"enabled": "support_enable",
@ -2472,7 +2476,7 @@
"unit": "mm",
"type": "float",
"default_value": 0.2,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"minimum_value_warning": "-0.5",
"maximum_value_warning": "5.0",
"enabled": "support_enable",
@ -2496,9 +2500,9 @@
"type": "float",
"default_value": 1,
"minimum_value": "0",
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_interface_extruder_nr",
"maximum_value_warning": "10",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": true,
"children":
{
@ -2509,11 +2513,11 @@
"unit": "mm",
"type": "float",
"default_value": 1,
"value": "extruderValue(support_extruder_nr, 'support_interface_height')",
"value": "extruderValue(support_interface_extruder_nr, 'support_interface_height')",
"minimum_value": "0",
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_interface_extruder_nr",
"maximum_value_warning": "10",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": true
},
"support_bottom_height":
@ -2523,12 +2527,12 @@
"unit": "mm",
"type": "float",
"default_value": 1,
"value": "extruderValue(support_extruder_nr, 'support_interface_height')",
"value": "extruderValue(support_interface_extruder_nr, 'support_interface_height')",
"minimum_value": "0",
"minimum_value_warning": "extruderValue(support_extruder_nr, 'support_bottom_stair_step_height')",
"global_inherits_stack": "support_extruder_nr",
"minimum_value_warning": "extruderValue(support_interface_extruder_nr, 'support_bottom_stair_step_height')",
"global_inherits_stack": "support_interface_extruder_nr",
"maximum_value_warning": "10",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": true
}
}
@ -2541,9 +2545,9 @@
"type": "float",
"default_value": 0.3,
"minimum_value": "0",
"global_inherits_stack": "support_extruder_nr",
"maximum_value_warning": "support_interface_height",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"global_inherits_stack": "support_interface_extruder_nr",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": true
},
"support_interface_density":
@ -2555,8 +2559,8 @@
"default_value": 100,
"minimum_value": "0",
"maximum_value_warning": "100",
"global_inherits_stack": "support_extruder_nr",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"global_inherits_stack": "support_interface_extruder_nr",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
"children":
@ -2570,8 +2574,8 @@
"default_value": 0.4,
"minimum_value": "0",
"value": "0 if support_interface_density == 0 else (support_interface_line_width * 100) / support_interface_density * (2 if support_interface_pattern == \"grid\" else (3 if support_interface_pattern == \"triangles\" else 1))",
"global_inherits_stack": "support_extruder_nr",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"global_inherits_stack": "support_interface_extruder_nr",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": false,
"settable_per_extruder": true
}
@ -2591,8 +2595,8 @@
"zigzag": "Zig Zag"
},
"default_value": "concentric",
"global_inherits_stack": "support_extruder_nr",
"enabled": "extruderValue(support_extruder_nr, 'support_interface_enable') and support_enable",
"global_inherits_stack": "support_interface_extruder_nr",
"enabled": "extruderValue(support_interface_extruder_nr, 'support_interface_enable') and support_enable",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@ -2602,7 +2606,7 @@
"description": "Use specialized towers to support tiny overhang areas. These towers have a larger diameter than the region they support. Near the overhang the towers' diameter decreases, forming a roof.",
"type": "bool",
"default_value": true,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"enabled": "support_enable",
"settable_per_mesh": true
},
@ -2613,10 +2617,10 @@
"unit": "mm",
"type": "float",
"default_value": 3.0,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"minimum_value": "0",
"maximum_value_warning": "10",
"enabled": "support_enable and extruderValue(support_extruder_nr, 'support_use_towers')",
"enabled": "support_enable and extruderValue(support_infill_extruder_nr, 'support_use_towers')",
"settable_per_mesh": true
},
"support_minimal_diameter":
@ -2626,11 +2630,11 @@
"unit": "mm",
"type": "float",
"default_value": 3.0,
"global_inherits_stack": "support_extruder_nr",
"global_inherits_stack": "support_infill_extruder_nr",
"minimum_value": "0",
"maximum_value_warning": "10",
"maximum_value": "extruderValue(support_extruder_nr, 'support_tower_diameter')",
"enabled": "support_enable and extruderValue(support_extruder_nr, 'support_use_towers')",
"maximum_value": "extruderValue(support_infill_extruder_nr, 'support_tower_diameter')",
"enabled": "support_enable and extruderValue(support_infill_extruder_nr, 'support_use_towers')",
"settable_per_mesh": true
},
"support_tower_roof_angle":
@ -2642,8 +2646,8 @@
"minimum_value": "0",
"maximum_value": "90",
"default_value": 65,
"global_inherits_stack": "support_extruder_nr",
"enabled": "support_enable and extruderValue(support_extruder_nr, 'support_use_towers')",
"global_inherits_stack": "support_infill_extruder_nr",
"enabled": "support_enable and extruderValue(support_infill_extruder_nr, 'support_use_towers')",
"settable_per_mesh": true
}
}
@ -2736,8 +2740,7 @@
"maximum_value_warning": "2500",
"enabled": "adhesion_type == \"skirt\" or adhesion_type == \"brim\"",
"settable_per_mesh": false,
"settable_per_extruder": true,
"global_inherits_stack": "adhesion_extruder_nr"
"settable_per_extruder": true
},
"brim_width":
{
@ -3273,7 +3276,7 @@
"type": "extruder",
"default_value": "0",
"value": "support_extruder_nr",
"enabled": "support_enable and machine_extruder_count > 1 and extruderValue(support_extruder_nr, 'support_interface_enable')",
"enabled": "support_enable and machine_extruder_count > 1 and extruderValue(support_interface_extruder_nr, 'support_interface_enable')",
"settable_per_mesh": false,
"settable_per_extruder": false
}
@ -3684,6 +3687,7 @@
"maximum_value": "90",
"default_value": 30,
"enabled": "support_conical_enabled and support_enable",
"global_inherits_stack": "support_infill_extruder_nr",
"settable_per_mesh": true
},
"support_conical_min_width":
@ -3697,6 +3701,7 @@
"maximum_value_warning": "100.0",
"type": "float",
"enabled": "support_conical_enabled and support_enable",
"global_inherits_stack": "support_infill_extruder_nr",
"settable_per_mesh": true
},
"magic_fuzzy_skin_enabled":