From 8cebaedd0ce5a32a9d97c5a89b813d3fb4e32e37 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 19 Oct 2016 13:14:06 +0200 Subject: [PATCH] JSOn refactor: moved support extruder settings to support catgegory (CURA-2707) --- cura/CuraApplication.py | 2 +- resources/definitions/fdmprinter.def.json | 90 +++++++++++------------ 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index b7092c4eaa..56690cf76c 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -283,6 +283,7 @@ class CuraApplication(QtApplication): cool_fan_enabled support support_enable + support_extruder_nr support_type support_interface_density platform_adhesion @@ -293,7 +294,6 @@ class CuraApplication(QtApplication): raft_surface_layers dual adhesion_extruder_nr - support_extruder_nr prime_tower_enable prime_tower_size prime_tower_position_x diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index cd23b9d677..b530cdf346 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2343,6 +2343,51 @@ "settable_per_mesh": true, "settable_per_extruder": false }, + "support_extruder_nr": + { + "label": "Support Extruder", + "description": "The extruder train to use for printing the support. This is used in multi-extrusion.", + "type": "extruder", + "default_value": "0", + "enabled": "support_enable and machine_extruder_count > 1", + "settable_per_mesh": false, + "settable_per_extruder": false, + "children": { + "support_infill_extruder_nr": + { + "label": "Support Infill Extruder", + "description": "The extruder train to use for printing the infill of the support. This is used in multi-extrusion.", + "type": "extruder", + "default_value": "0", + "value": "support_extruder_nr", + "enabled": "support_enable and machine_extruder_count > 1", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "support_extruder_nr_layer_0": + { + "label": "First Layer Support Extruder", + "description": "The extruder train to use for printing the first layer of support infill. This is used in multi-extrusion.", + "type": "extruder", + "default_value": "0", + "value": "support_extruder_nr", + "enabled": "support_enable and machine_extruder_count > 1", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "support_interface_extruder_nr": + { + "label": "Support Interface Extruder", + "description": "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion.", + "type": "extruder", + "default_value": "0", + "value": "support_extruder_nr", + "enabled": "support_enable and machine_extruder_count > 1", + "settable_per_mesh": false, + "settable_per_extruder": false + } + } + }, "support_type": { "label": "Support Placement", @@ -3328,51 +3373,6 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "support_extruder_nr": - { - "label": "Support Extruder", - "description": "The extruder train to use for printing the support. This is used in multi-extrusion.", - "type": "extruder", - "default_value": "0", - "enabled": "support_enable and machine_extruder_count > 1", - "settable_per_mesh": false, - "settable_per_extruder": false, - "children": { - "support_infill_extruder_nr": - { - "label": "Support Infill Extruder", - "description": "The extruder train to use for printing the infill of the support. This is used in multi-extrusion.", - "type": "extruder", - "default_value": "0", - "value": "support_extruder_nr", - "enabled": "support_enable and machine_extruder_count > 1", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "support_extruder_nr_layer_0": - { - "label": "First Layer Support Extruder", - "description": "The extruder train to use for printing the first layer of support infill. This is used in multi-extrusion.", - "type": "extruder", - "default_value": "0", - "value": "support_extruder_nr", - "enabled": "support_enable and machine_extruder_count > 1", - "settable_per_mesh": false, - "settable_per_extruder": false - }, - "support_interface_extruder_nr": - { - "label": "Support Interface Extruder", - "description": "The extruder train to use for printing the roofs and bottoms of the support. This is used in multi-extrusion.", - "type": "extruder", - "default_value": "0", - "value": "support_extruder_nr", - "enabled": "support_enable and machine_extruder_count > 1", - "settable_per_mesh": false, - "settable_per_extruder": false - } - } - }, "prime_tower_enable": { "label": "Enable Prime Tower",