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

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -413,7 +413,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
         for entry in settings:
             key = entry.get("key")
             if key in self.__material_property_setting_map:
-                self.setProperty(self.__material_property_setting_map[key], "value", entry.text, self._definition)
+                self.setProperty(self.__material_property_setting_map[key], "value", entry.text)
                 global_setting_values[self.__material_property_setting_map[key]] = entry.text
             elif key in self.__unmapped_settings:
                 if key == "hardware compatible":
@@ -463,10 +463,10 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
                     new_material.getMetaData()["compatible"] = machine_compatibility
 
                     for key, value in global_setting_values.items():
-                        new_material.setProperty(key, "value", value, definition)
+                        new_material.setProperty(key, "value", value)
 
                     for key, value in machine_setting_values.items():
-                        new_material.setProperty(key, "value", value, definition)
+                        new_material.setProperty(key, "value", value)
 
                     new_material._dirty = False
 
@@ -510,13 +510,13 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
                     new_hotend_material.getMetaData()["compatible"] = hotend_compatibility
 
                     for key, value in global_setting_values.items():
-                        new_hotend_material.setProperty(key, "value", value, definition)
+                        new_hotend_material.setProperty(key, "value", value)
 
                     for key, value in machine_setting_values.items():
-                        new_hotend_material.setProperty(key, "value", value, definition)
+                        new_hotend_material.setProperty(key, "value", value)
 
                     for key, value in hotend_setting_values.items():
-                        new_hotend_material.setProperty(key, "value", value, definition)
+                        new_hotend_material.setProperty(key, "value", value)
 
                     new_hotend_material._dirty = False
                     UM.Settings.ContainerRegistry.getInstance().addContainer(new_hotend_material)

resources/definitions/fdmprinter.def.json

@@ -1696,6 +1696,7 @@
                     "unit": "mm/s",
                     "type": "float",
                     "default_value": 30,
+                    "value": "speed_print * 30 / 60",
                     "minimum_value": "0.1",
                     "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                     "maximum_value_warning": "300",

resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg

@@ -15,5 +15,6 @@ wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg

@@ -15,9 +15,9 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_wall = 50
 speed_topbottom = 30
 speed_travel = 150
-speed_layer_0 = 30
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_wall = 40
 speed_wall_0 = 25
 speed_topbottom = 20

resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 2.1
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 speed_wall_0 = 25
 cool_min_layer_time = 5
 cool_min_speed = 10

resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
 cool_min_speed = 10

resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg

@@ -15,10 +15,10 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_wall = 40
 speed_topbottom = 30
 speed_travel = 150
-speed_layer_0 = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
 cool_min_speed = 10

resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20

resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20

resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 speed_infill = 55
 cool_min_layer_time = 3
 cool_fan_speed_min = 50

resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 2.1
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
 cool_min_speed = 15

resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 2
 cool_fan_speed_min = 20
 cool_min_speed = 15

resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg

@@ -15,9 +15,9 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 40
 speed_travel = 150
-speed_layer_0 = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 80
 cool_min_speed = 10

resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 2
 cool_fan_speed_min = 80

resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 80

resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 5
 cool_fan_speed_min = 80
 cool_min_speed = 8

resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg

@@ -15,6 +15,7 @@ wall_thickness = 2.1
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 3
 cool_fan_speed_min = 80
 cool_min_speed = 8

resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg

@@ -20,7 +20,6 @@ raft_surface_thickness = 0.2
 raft_surface_line_width = 0.57
 raft_interface_line_spacing = 1.4
 raft_margin = 15
-speed_layer_0 = 30
 raft_airgap = 0.37
 infill_overlap = 5
 layer_height = 0.3
@@ -40,6 +39,7 @@ line_width = 0.57
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.2
 speed_print = 25
+speed_layer_0 = =round(speed_print * 30 / 50)
 support_line_distance = 2.85
 support_angle = 45
 cool_min_layer_time = 3

resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg

@@ -33,6 +33,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 25
+speed_layer_0 = =round(speed_print * 30 / 25)
 speed_wall_0 = 20
 support_angle = 45
 cool_min_layer_time = 3

resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg

@@ -33,6 +33,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 speed_wall_0 = 20
 support_angle = 45
 cool_min_layer_time = 3

resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg

@@ -20,7 +20,6 @@ support_top_distance = 0.5
 raft_surface_thickness = 0.2
 wall_thickness = 2.4
 raft_margin = 15
-speed_layer_0 = 30
 raft_airgap = 0.44
 infill_overlap = 5
 layer_height = 0.2
@@ -41,6 +40,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.25
 raft_base_line_width = 1.6
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 support_angle = 45
 raft_interface_line_spacing = 1.8
 

resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg

@@ -31,6 +31,7 @@ infill_sparse_density = 25
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 2
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5
 

resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg

@@ -31,6 +31,7 @@ infill_sparse_density = 25
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 2
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5
 

resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg

@@ -31,6 +31,7 @@ infill_sparse_density = 30
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 3
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 support_angle = 45
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8

resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg

@@ -31,6 +31,7 @@ infill_sparse_density = 30
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 3
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 support_angle = 45
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8

resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg

@@ -32,6 +32,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 support_angle = 45
 cool_min_layer_time = 3
 

resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg

@@ -32,6 +32,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 support_angle = 45
 cool_min_layer_time = 3
 

resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg

@@ -16,6 +16,7 @@ material_print_temperature = 240
 prime_tower_size = 16
 skin_overlap = 20
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)

resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg

@@ -17,6 +17,7 @@ material_print_temperature = 235
 material_standby_temperature = 100
 prime_tower_size = 16
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)

resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg

@@ -16,6 +16,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_standby_temperature = 100
 prime_tower_size = 16
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)
 

resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg

@@ -16,6 +16,7 @@ material_print_temperature = 230
 material_standby_temperature = 100
 prime_tower_size = 16
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)
 

resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg

@@ -15,6 +15,7 @@ material_standby_temperature = 100
 prime_tower_size = 17
 skin_overlap = 20
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)

resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg

@@ -15,6 +15,7 @@ material_print_temperature = 245
 material_standby_temperature = 100
 prime_tower_size = 17
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)

resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg

@@ -16,6 +16,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_standby_temperature = 100
 prime_tower_size = 17
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)
 

resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg

@@ -16,6 +16,7 @@ material_print_temperature = 240
 material_standby_temperature = 100
 prime_tower_size = 17
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)
 

resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg

@@ -17,6 +17,7 @@ machine_nozzle_heat_up_speed = 1.6
 material_standby_temperature = 100
 prime_tower_enable = False
 speed_print = 80
+speed_layer_0 = =round(speed_print * 30 / 80)
 speed_topbottom = =math.ceil(speed_print * 30 / 80)
 speed_wall = =math.ceil(speed_print * 40 / 80)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)

resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg

@@ -19,6 +19,7 @@ material_print_temperature = 195
 material_standby_temperature = 100
 skin_overlap = 10
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 30 / 60)
 top_bottom_thickness = 1

resources/variants/ultimaker3_aa04.inst.cfg

@@ -28,6 +28,7 @@ retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
 speed_print = 70
+speed_layer_0 = =speed_print * 30 / 70
 speed_topbottom = =math.ceil(speed_print * 30 / 70)
 speed_wall = =math.ceil(speed_print * 30 / 70)
 support_angle = 60

resources/variants/ultimaker3_extended_aa04.inst.cfg

@@ -27,6 +27,7 @@ retraction_min_travel = 1.5
 retraction_prime_speed = 25
 skin_overlap = 15
 speed_print = 70
+speed_layer_0 = =round(speed_print * 30 / 70)
 speed_topbottom = =math.ceil(speed_print * 30 / 70)
 speed_wall = =math.ceil(speed_print * 30 / 70)
 support_angle = 60