From 58e7e6ef5a4aa4e4eb86c9401bde23476160c166 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 6 Dec 2016 11:38:56 +0100 Subject: [PATCH 1/2] Added default_printing_temperature property CURA-2586 --- cura/Settings/MaterialSettingsVisibilityHandler.py | 2 +- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 +- resources/definitions/fdmprinter.def.json | 12 ++++++++++++ resources/definitions/ultimaker3.def.json | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cura/Settings/MaterialSettingsVisibilityHandler.py b/cura/Settings/MaterialSettingsVisibilityHandler.py index 7286f509bf..43e5cf2b0a 100644 --- a/cura/Settings/MaterialSettingsVisibilityHandler.py +++ b/cura/Settings/MaterialSettingsVisibilityHandler.py @@ -8,7 +8,7 @@ class MaterialSettingsVisibilityHandler(UM.Settings.Models.SettingVisibilityHand super().__init__(parent = parent, *args, **kwargs) material_settings = set([ - "material_print_temperature", + "default_material_print_temperature", "material_bed_temperature", "material_standby_temperature", "cool_fan_speed", diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 84a7d95a7c..0d2c1890e0 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -568,7 +568,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): # Map XML file setting names to internal names __material_property_setting_map = { - "print temperature": "material_print_temperature", + "print temperature": "default_material_print_temperature", "heated bed temperature": "material_bed_temperature", "standby temperature": "material_standby_temperature", "processing temperature graph": "material_flow_temp_graph", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c79b025f3f..9bc7a58897 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1235,6 +1235,17 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "default_material_print_temperature": + { + "label": "Default Printing Temperature", + "description": "The default temperature used for printing. This should be the \"base\" temperature of a material. All other print temperatures should use offsets based on this value", + "unit": "°C", + "type": "float", + "default_value": 210, + "enabled": false, + "settable_per_extruder": true, + "minimum_value": "-273.15" + }, "material_print_temperature": { "label": "Printing Temperature", @@ -1242,6 +1253,7 @@ "unit": "°C", "type": "float", "default_value": 210, + "value": "default_material_print_temperature", "minimum_value": "-273.15", "minimum_value_warning": "0", "maximum_value_warning": "260", diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index dc8f70cadd..71bbcccbdd 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -105,7 +105,7 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "line_width": { "value": "machine_nozzle_size * 0.875" }, "machine_min_cool_heat_time_window": { "value": "15" }, - "material_print_temperature": { "value": "200" }, + "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, "multiple_mesh_overlap": { "value": "0" }, "prime_tower_enable": { "value": "True" }, From f4979be5cba0996c43b167ad252c40896b9855d6 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 6 Dec 2016 11:48:04 +0100 Subject: [PATCH 2/2] JSON fix: description of speed_travel_layer_0 now includes explanation of inheritance function (CURA-3066) --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2fb0794766..7f2cad3191 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1806,7 +1806,7 @@ "speed_travel_layer_0": { "label": "Initial Layer Travel Speed", - "description": "The speed of travel moves in the initial layer. A lower value is advised to prevent pulling previously printed parts away from the build plate.", + "description": "The speed of travel moves in the initial layer. A lower value is advised to prevent pulling previously printed parts away from the build plate. The value of this setting can automatically be calculated from the ratio between the Travel Speed and the Print Speed.", "unit": "mm/s", "type": "float", "default_value": 60,