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

cura/Settings/CuraContainerRegistry.py

@@ -235,7 +235,7 @@ class CuraContainerRegistry(ContainerRegistry):
                     if not expected_machine_definition:
                         expected_machine_definition = global_container_stack.definition.getId()
                 if expected_machine_definition is not None and profile_definition is not None and profile_definition != expected_machine_definition:
-                    Logger.log("e", "Profile [%s] is for machine [%s] but the current active machine is [%s]. Will not import the profile", file_name)
+                    Logger.log("e", "Profile [%s] is for machine [%s] but the current active machine is [%s]. Will not import the profile", file_name, profile_definition, expected_machine_definition)
                     return { "status": "error",
                              "message": catalog.i18nc("@info:status Don't translate the XML tags <filename> or <message>!", "The machine defined in profile <filename>{0}</filename> doesn't match with your current machine, could not import it.", file_name)}
 

cura/Settings/MachineManager.py

@@ -559,7 +559,8 @@ class MachineManager(QObject):
     def activeVariantNames(self) -> List[str]:
         result = []
 
-        active_stacks = ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks()
+        # Just return the variants in the extruder stack(s). For the variant in the global stack, use activeVariantBuildplateName
+        active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
         if active_stacks is not None:
             for stack in active_stacks:
                 variant_container = stack.variant

resources/definitions/ultimaker3.def.json

@@ -90,6 +90,7 @@
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
+        "initial_layer_line_width_factor": { "value": "120" },		
         "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
@@ -109,7 +110,9 @@
         "material_bed_temperature": { "maximum_value": "115" },
         "material_bed_temperature_layer_0": { "maximum_value": "115" },
         "material_standby_temperature": { "value": "100" },
+        "meshfix_maximum_resolution": { "value": "0.04" },		
         "multiple_mesh_overlap": { "value": "0" },
+        "optimize_wall_printing_order": { "value": "True" },		
         "prime_tower_enable": { "default_value": true },
         "raft_airgap": { "value": "0" },
         "raft_base_thickness": { "value": "0.3" },
@@ -120,6 +123,7 @@
         "raft_margin": { "value": "10" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "2" },
+        "retraction_combing": { "default_value": "noskin" },		
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },

resources/qml/PrintMonitor.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.8
+import QtQuick 2.7
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Layouts 1.1

resources/qml/SaveButton.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.8
+import QtQuick 2.7
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Layouts 1.1

resources/qml/Settings/SettingCheckBox.qml

@@ -1,9 +1,9 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Uranium is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.8
+import QtQuick 2.7
 import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.0
 
 import UM 1.2 as UM
 

resources/qml/Settings/SettingItem.qml

@@ -1,9 +1,9 @@
 // Copyright (c) 2018 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.8
+import QtQuick 2.7
 import QtQuick.Layouts 1.2
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.0
 
 import UM 1.1 as UM
 import Cura 1.0 as Cura

resources/qml/SidebarContents.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.8
+import QtQuick 2.7
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Layouts 1.1

resources/qml/SidebarHeader.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2017 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.8
+import QtQuick 2.7
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
 

resources/qml/SidebarTooltip.qml

@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
-import QtQuick 2.8
+import QtQuick 2.7
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Layouts 1.1

resources/qml/WorkspaceSummaryDialog.qml

@@ -120,6 +120,31 @@ UM.Dialog
                     width: (parent.width / 3) | 0
                 }
             }
+            Column
+            {
+                width: parent.width
+                visible: Cura.MachineManager.hasVariantBuildplates
+                Item // Spacer
+                {
+                    height: spacerHeight
+                    width: height
+                }
+                Row
+                {
+                    width: parent.width
+                    height: childrenRect.height
+                    Label
+                    {
+                        text: catalog.i18nc("@action:label", "Build plate")
+                        width: (parent.width / 3) | 0
+                    }
+                    Label
+                    {
+                        text: Cura.MachineManager.activeVariantBuildplateName
+                        width: (parent.width / 3) | 0
+                    }
+                }
+            }
 
             Repeater
             {

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

@@ -13,6 +13,7 @@ setting_version = 4
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
+infill_line_width = =round(line_width * 0.42 / 0.35, 2)
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 5
@@ -20,9 +21,9 @@ material_standby_temperature = 100
 prime_tower_enable = False
 skin_overlap = 20
 speed_layer_0 = 20
-speed_topbottom = =math.ceil(speed_print * 35 / 70)
+speed_topbottom = =math.ceil(speed_print * 40 / 70)
-speed_wall = =math.ceil(speed_print * 50 / 70)
+speed_wall = =math.ceil(speed_print * 55 / 70)
-speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 45 / 50)
 top_bottom_thickness = 1
 wall_thickness = 1
 

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

@@ -13,6 +13,7 @@ setting_version = 4
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
+infill_line_width = =round(line_width * 0.42 / 0.35, 2)
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_standby_temperature = 100

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

@@ -14,6 +14,7 @@ setting_version = 4
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 10
+infill_line_width = =round(line_width * 0.42 / 0.35, 2)
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature - 5

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

@@ -14,6 +14,7 @@ setting_version = 4
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =cool_fan_speed
 cool_min_speed = 7
+infill_line_width = =round(line_width * 0.42 / 0.35, 2)
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_standby_temperature = 100

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

@@ -18,11 +18,10 @@ cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 4
 gradual_infill_step_height = =5 * layer_height
-gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.38 / 0.38, 2)
 infill_overlap = 0
-infill_pattern = tetrahedral
+infill_pattern = cross_3d
-infill_sparse_density = 96
+infill_sparse_density = 10
 infill_wipe_dist = 0.1
 jerk_enabled = True
 jerk_print = 25

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

@@ -18,11 +18,10 @@ cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 4
 gradual_infill_step_height = =5 * layer_height
-gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.38 / 0.38, 2)
 infill_overlap = 0
-infill_pattern = tetrahedral
+infill_pattern = cross_3d
-infill_sparse_density = 96
+infill_sparse_density = 10
 infill_wipe_dist = 0.1
 jerk_enabled = True
 jerk_print = 25

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

@@ -18,11 +18,10 @@ cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 4
 gradual_infill_step_height = =5 * layer_height
-gradual_infill_steps = 4
 infill_line_width = =round(line_width * 0.38 / 0.38, 2)
 infill_overlap = 0
-infill_pattern = tetrahedral
+infill_pattern = cross_3d
-infill_sparse_density = 96
+infill_sparse_density = 10
 infill_wipe_dist = 0.1
 jerk_enabled = True
 jerk_print = 25

resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg

@@ -15,8 +15,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
-infill_line_width = =round(line_width * 0.535 / 0.75, 2)
+infill_line_width = =round(line_width * 0.65 / 0.75, 2)
-infill_pattern = cubic
+infill_pattern = triangles
 line_width = =machine_nozzle_size * 0.9375
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
@@ -25,6 +25,12 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = True
+retract_at_layer_change = False
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
 support_line_width = =line_width * 0.75
 support_pattern = ='triangles'

resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg

@@ -15,8 +15,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
-infill_line_width = =round(line_width * 0.535 / 0.75, 2)
+infill_line_width = =round(line_width * 0.65 / 0.75, 2)
-infill_pattern = cubic
+infill_pattern = triangles
 layer_height = 0.4
 line_width = =machine_nozzle_size * 0.9375
 machine_nozzle_cool_down_speed = 0.75
@@ -27,6 +27,12 @@ material_print_temperature = =default_material_print_temperature + 15
 material_standby_temperature = 100
 prime_tower_enable = True
 raft_margin = 10
+retract_at_layer_change = False
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
 support_line_width = =line_width * 0.75
 support_pattern = ='triangles'

resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg

@@ -15,8 +15,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
 cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
-infill_line_width = =round(line_width * 0.535 / 0.75, 2)
+infill_line_width = =round(line_width * 0.65 / 0.75, 2)
-infill_pattern = cubic
+infill_pattern = triangles
 layer_height = 0.3
 line_width = =machine_nozzle_size * 0.9375
 machine_nozzle_cool_down_speed = 0.75
@@ -26,6 +26,12 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature -
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 prime_tower_enable = True
+retract_at_layer_change = False
+speed_print = 45
+speed_topbottom = =math.ceil(speed_print * 35 / 45)
+speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall_x = =speed_wall
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
 support_angle = 70
 support_line_width = =line_width * 0.75
 support_pattern = ='triangles'

resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg

@@ -15,11 +15,10 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
-gradual_infill_steps = 5
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
-infill_pattern = tetrahedral
+infill_pattern = cross_3d
-infill_sparse_density = 80
+infill_sparse_density = 10
 jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
 jerk_support = =math.ceil(jerk_print * 25 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)

resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg

@@ -15,11 +15,10 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
-gradual_infill_steps = 5
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
-infill_pattern = tetrahedral
+infill_pattern = cross_3d
-infill_sparse_density = 80
+infill_sparse_density = 10
 jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
 jerk_support = =math.ceil(jerk_print * 25 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)

resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg

@@ -15,11 +15,10 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
-gradual_infill_steps = 5
 infill_before_walls = True
 infill_line_width = =round(line_width * 0.7 / 0.8, 2)
-infill_pattern = tetrahedral
+infill_pattern = cross_3d
-infill_sparse_density = 80
+infill_sparse_density = 10
 jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
 jerk_support = =math.ceil(jerk_print * 25 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)