diff options
author | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-17 11:01:04 +0300 |
---|---|---|
committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-17 11:01:04 +0300 |
commit | f6aa40970143a2f44a8eb48bc36cfa322cdf3291 (patch) | |
tree | 6cd8a5415f84da69aed38e64e66cf3b2b8e05ba2 | |
parent | f9447edf47d28bd590b184bb9df2a35d386cc69c (diff) | |
parent | 50a351149641bd435f81f09b22dbd57f723f6a34 (diff) |
Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main
7 files changed, 22 insertions, 73 deletions
diff --git a/cura/Machines/Models/ActiveIntentQualitiesModel.py b/cura/Machines/Models/ActiveIntentQualitiesModel.py index 769f9410c5..2e13f7dbcb 100644 --- a/cura/Machines/Models/ActiveIntentQualitiesModel.py +++ b/cura/Machines/Models/ActiveIntentQualitiesModel.py @@ -36,6 +36,8 @@ class ActiveIntentQualitiesModel(ListModel): IntentManager.intentCategoryChangedSignal.connect(self._update) machine_manager = cura.CuraApplication.CuraApplication.getInstance().getMachineManager() machine_manager.activeQualityGroupChanged.connect(self._update) + machine_manager.globalContainerChanged.connect(self._updateDelayed) + machine_manager.extruderChanged.connect(self._updateDelayed) # We also need to update if an extruder gets disabled self._update_timer = QTimer() self._update_timer.setInterval(100) diff --git a/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml index c9abcab1c8..1a54dc27db 100644 --- a/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/Recommended/ProfileWarningReset.qml @@ -3,13 +3,10 @@ import QtQuick 2.10 import UM 1.6 as UM import Cura 1.6 as Cura -Rectangle +Item { height: visible ? UM.Theme.getSize("action_button_icon").height : 0 visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.MachineManager.hasCustomQuality - anchors.topMargin: UM.Theme.getSize("default_margin") - anchors.bottomMargin: UM.Theme.getSize("default_margin") - Rectangle { @@ -34,6 +31,7 @@ Rectangle UM.Label { id: warning + width: parent.width - warningIcon.width - resetToDefaultQualityButton.width anchors { left: warningIcon.right @@ -41,7 +39,7 @@ Rectangle leftMargin: UM.Theme.getSize("thin_margin").width } - text: "" + wrapMode: Text.WordWrap states: [ State diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index aac8dcecfb..086e27d41b 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -40,7 +40,7 @@ Item RecommendedQualityProfileSelector { width: parent.width - visible: recommendedResolutionSelector.visible + hasQualityOptions: recommendedResolutionSelector.visible } RecommendedResolutionSelector @@ -54,6 +54,7 @@ Item { width: parent.width visible: !recommendedResolutionSelector.visible + Layout.fillWidth: true } @@ -61,6 +62,8 @@ Item { width: parent.width Layout.fillWidth: true + Layout.topMargin: UM.Theme.getSize("thin_margin").height + Layout.bottomMargin: UM.Theme.getSize("thin_margin").height } //Line between the sections. @@ -83,27 +86,23 @@ Item RecommendedInfillDensitySelector { width: parent.width - // TODO Create a reusable component with these properties to not define them separately for each component labelColumnWidth: parent.firstColumnWidth Layout.fillWidth: true - Layout.leftMargin: UM.Theme.getSize("default_margin").width Layout.rightMargin: UM.Theme.getSize("default_margin").width } RecommendedSupportSelector { width: parent.width - // TODO Create a reusable component with these properties to not define them separately for each component labelColumnWidth: parent.firstColumnWidth - Layout.leftMargin: UM.Theme.getSize("default_margin").width + Layout.fillWidth: true } RecommendedAdhesionSelector { width: parent.width - // TODO Create a reusable component with these properties to not define them separately for each component labelColumnWidth: parent.firstColumnWidth - Layout.leftMargin: UM.Theme.getSize("default_margin").width + Layout.fillWidth: true } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 6bcca955d1..87cb271ed4 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -12,8 +12,11 @@ import ".." Item { id: qualityRow + + property bool hasQualityOptions: true + height: childrenRect.height - visible: intentSelectionRepeater.count > 1 //Only show selector if there's more options than just "default". + visible: intentSelectionRepeater.count > 1 && hasQualityOptions //Only show selector if there's more options than just "default". RowLayout { diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml index 6217cfe1cc..bbad686514 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml @@ -66,6 +66,11 @@ Item { var selected_item = model.getItem(currentIndex) Cura.IntentManager.selectIntent(selected_item.intent_category, selected_item.quality_type) + + if (Cura.IntentManager.currentIntentCategory == selected_item.intent_category) + { + recommendedResolutionSelector._previousResolution = selected_item.quality_type; + } } Connections diff --git a/resources/variants/ultimaker_s3_dd04.inst.cfg b/resources/variants/ultimaker_s3_dd04.inst.cfg index 8d6e94905b..7a31d85f1d 100644 --- a/resources/variants/ultimaker_s3_dd04.inst.cfg +++ b/resources/variants/ultimaker_s3_dd04.inst.cfg @@ -9,37 +9,8 @@ type = variant hardware_type = nozzle [values] -brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = DD 0.4 machine_nozzle_size = 0.4 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 +machine_nozzle_tip_outer_diameter = 1.2 retraction_prime_speed = =retraction_speed -speed_infill = =speed_print -speed_layer_0 = 20 -speed_print = 45 -speed_support = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel_layer_0 = 50 -speed_wall = =math.ceil(speed_print * 30 / 45) -speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -speed_wall_x = =speed_wall -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length -top_bottom_thickness = =layer_height * 6 diff --git a/resources/variants/ultimaker_s5_dd04.inst.cfg b/resources/variants/ultimaker_s5_dd04.inst.cfg index 97eef9fcb6..faad9ceefe 100644 --- a/resources/variants/ultimaker_s5_dd04.inst.cfg +++ b/resources/variants/ultimaker_s5_dd04.inst.cfg @@ -9,37 +9,8 @@ type = variant hardware_type = nozzle [values] -brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = DD 0.4 machine_nozzle_size = 0.4 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 +machine_nozzle_tip_outer_diameter = 1.2 retraction_prime_speed = =retraction_speed -speed_infill = =speed_print -speed_layer_0 = 20 -speed_print = 45 -speed_support = =speed_topbottom -speed_topbottom = =math.ceil(speed_print * 25 / 45) -speed_travel_layer_0 = 50 -speed_wall = =math.ceil(speed_print * 30 / 45) -speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -speed_wall_x = =speed_wall -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length -top_bottom_thickness = =layer_height * 6 |