From 53e163011ed61abe0bcc37ce82748ea13052a892 Mon Sep 17 00:00:00 2001 From: Christian Kvasny Date: Tue, 25 Oct 2022 11:34:17 +0200 Subject: [PATCH 01/15] Update vzbot_base.def.json Adjusted some default values --- resources/definitions/vzbot_base.def.json | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index a3802664d4..b2a4ddddd1 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -50,13 +50,15 @@ "adhesion_type": { "default_value": "skirt" }, "retraction_amount": { "default_value": 0.65 }, "skirt_brim_minimal_length": { "default_value": 550 }, - "retraction_speed": { "default_value": 30, "maximum_value_warning": 130 }, - "retraction_retract_speed": { "maximum_value_warning": 130 }, - "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 }, + "retraction_speed": { "default_value": 45, "maximum_value_warning": 150 }, + "retraction_retract_speed": { "maximum_value_warning": 150 }, + "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 150 }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop": { "default_value": 0.2 }, "retraction_combing": { "value": "'noskin'" }, + "z_seam_type": { "value": "'back'" }, "retraction_combing_max_distance": { "default_value": 10 }, + "retraction_hop_enabled": { "default_value": false }, "travel_avoid_other_parts": { "default_value": false }, "speed_print": { "value": 300, "maximum_value_warning": 1001 }, "speed_infill": { "maximum_value_warning": 1001 }, @@ -68,13 +70,16 @@ "speed_wall_x": { "value": "math.ceil(speed_print)", "maximum_value_warning": 1001 }, "speed_topbottom": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, "speed_roofing": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, - "speed_slowdown_layers": { "default_value": 4 }, + "speed_slowdown_layers": { "default_value": 2 }, "roofing_layer_count": { "value": 1 }, "optimize_wall_printing_order": { "default_value": true }, "infill_enable_travel_optimization": { "default_value": true }, + "infill_sparse_density": { "value": 35 }, "minimum_polygon_circumference": { "default_value": 0.2 }, + "xy_offset_layer_0": { "value": 0.3 }, "wall_overhang_angle": { "default_value": 75 }, "wall_overhang_speed_factor": { "default_value": 50 }, + "infill_pattern": { "value": "'grid' if infill_sparse_density > 40 else 'cubic'" }, "bridge_settings_enabled": { "default_value": true }, "bridge_wall_coast": { "default_value": 10 }, "bridge_fan_speed": { "default_value": 100 }, @@ -82,7 +87,7 @@ "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, "alternate_extra_perimeter": { "default_value": true }, "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, - "cool_min_layer_time": { "default_value": 15 }, + "cool_min_layer_time": { "default_value": 5 }, "cool_fan_speed_min": { "value": "cool_fan_speed" }, "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" }, "cool_fan_full_layer": { "value": 4 }, @@ -92,17 +97,20 @@ "fill_outline_gaps": { "default_value": true }, "meshfix_maximum_resolution": { "default_value": 0.01 }, "infill_before_walls": { "default_value": false }, + "skin_monotonic": { "default_value": true }, "zig_zaggify_infill": { "value": true }, "min_infill_area": { "default_value": 5.0 }, "acceleration_enabled": { "default_value": false }, "acceleration_print": { "default_value": 15000, "maximum_value_warning": 50000 }, + "acceleration_infill": { "maximum_value_warning": 50000 }, + "acceleration_wall": { "maximum_value_warning": 50000 }, "acceleration_wall_0": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_wall_x": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_travel_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_roofing": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_topbottom": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_travel": { "value": 20000, "maximum_value_warning": 50000 }, + "acceleration_travel": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_skirt_brim": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_print_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, "jerk_enabled": { "default_value": false }, From de5957be6985304ae63ac63a1c607d23b68853e3 Mon Sep 17 00:00:00 2001 From: Christian Kvasny Date: Wed, 30 Nov 2022 01:58:44 +0100 Subject: [PATCH 02/15] Update vzbot_base.def.json Fix issue(s) with the introduced code --- resources/definitions/vzbot_base.def.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index b2a4ddddd1..671db0f58e 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -53,7 +53,7 @@ "retraction_speed": { "default_value": 45, "maximum_value_warning": 150 }, "retraction_retract_speed": { "maximum_value_warning": 150 }, "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 150 }, - "retraction_hop_enabled": { "default_value": true }, + "retraction_hop_enabled": { "default_value": false }, "retraction_hop": { "default_value": 0.2 }, "retraction_combing": { "value": "'noskin'" }, "z_seam_type": { "value": "'back'" }, @@ -70,7 +70,6 @@ "speed_wall_x": { "value": "math.ceil(speed_print)", "maximum_value_warning": 1001 }, "speed_topbottom": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, "speed_roofing": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, - "speed_slowdown_layers": { "default_value": 2 }, "roofing_layer_count": { "value": 1 }, "optimize_wall_printing_order": { "default_value": true }, "infill_enable_travel_optimization": { "default_value": true }, @@ -82,25 +81,21 @@ "infill_pattern": { "value": "'grid' if infill_sparse_density > 40 else 'cubic'" }, "bridge_settings_enabled": { "default_value": true }, "bridge_wall_coast": { "default_value": 10 }, - "bridge_fan_speed": { "default_value": 100 }, "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, "alternate_extra_perimeter": { "default_value": true }, "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, - "cool_min_layer_time": { "default_value": 5 }, - "cool_fan_speed_min": { "value": "cool_fan_speed" }, "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" }, "cool_fan_full_layer": { "value": 4 }, "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, "line_width": { "value": "machine_nozzle_size * 1.125" }, "wall_line_width": { "value": "machine_nozzle_size" }, - "fill_outline_gaps": { "default_value": true }, "meshfix_maximum_resolution": { "default_value": 0.01 }, "infill_before_walls": { "default_value": false }, "skin_monotonic": { "default_value": true }, "zig_zaggify_infill": { "value": true }, "min_infill_area": { "default_value": 5.0 }, - "acceleration_enabled": { "default_value": false }, + "acceleration_enabled": { "default_value": true }, "acceleration_print": { "default_value": 15000, "maximum_value_warning": 50000 }, "acceleration_infill": { "maximum_value_warning": 50000 }, "acceleration_wall": { "maximum_value_warning": 50000 }, @@ -113,7 +108,6 @@ "acceleration_travel": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_skirt_brim": { "value": 15000, "maximum_value_warning": 50000 }, "acceleration_print_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, - "jerk_enabled": { "default_value": false }, "jerk_wall_0": { "value": 10 }, "jerk_roofing": { "value": 10 } } From fc6db7b0205f7d8e9c0920a8036074f68d38af4e Mon Sep 17 00:00:00 2001 From: Christian Kvasny Date: Mon, 5 Dec 2022 13:14:31 +0100 Subject: [PATCH 03/15] Update vzbot_base.def.json remove retraction_hop_enabled false --- resources/definitions/vzbot_base.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index 671db0f58e..686e81f070 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -53,7 +53,6 @@ "retraction_speed": { "default_value": 45, "maximum_value_warning": 150 }, "retraction_retract_speed": { "maximum_value_warning": 150 }, "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 150 }, - "retraction_hop_enabled": { "default_value": false }, "retraction_hop": { "default_value": 0.2 }, "retraction_combing": { "value": "'noskin'" }, "z_seam_type": { "value": "'back'" }, From c4621cbb1a2cf87ca659483343441d3212ae6c4c Mon Sep 17 00:00:00 2001 From: Christian Kvasny Date: Mon, 5 Dec 2022 13:24:32 +0100 Subject: [PATCH 04/15] Update resources/definitions/vzbot_base.def.json removed Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/vzbot_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index 686e81f070..44b4566ef5 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -57,8 +57,7 @@ "retraction_combing": { "value": "'noskin'" }, "z_seam_type": { "value": "'back'" }, "retraction_combing_max_distance": { "default_value": 10 }, - "retraction_hop_enabled": { "default_value": false }, - "travel_avoid_other_parts": { "default_value": false }, + "travel_avoid_other_parts": { "default_value": false }, "speed_print": { "value": 300, "maximum_value_warning": 1001 }, "speed_infill": { "maximum_value_warning": 1001 }, "speed_travel": { "value": 300, "maximum_value_warning": 1001 }, From 358ca13fd81ccba28e8a77ec664cac0abe3bf07a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Dec 2022 12:03:31 +0100 Subject: [PATCH 05/15] Also show 'warning' when only recommended settings changed. part of CURA-9347 --- .../ProfileWarningReset.qml | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index 5e6a3d8157..bfe1dcba1a 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -13,13 +13,13 @@ Item property bool fullWarning: true // <- Can you see the warning icon and the text, or is it just the buttons? height: visible ? UM.Theme.getSize("action_button_icon").height : 0 - visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.MachineManager.hasCustomQuality + visible: Cura.MachineManager.hasUserSettings || Cura.MachineManager.hasCustomQuality Rectangle { id: warningIcon visible: fullWarning - color: UM.Theme.getColor("um_yellow_5") + color: UM.Theme.getColor("warning") height: UM.Theme.getSize("action_button_icon").height width: visible ? height : 0 radius: width @@ -30,6 +30,7 @@ Item } UM.ColorImage { + id: warningIconImage height: UM.Theme.getSize("action_button_icon").height width: height source: UM.Theme.getIcon("Warning", "low") @@ -54,7 +55,7 @@ Item State { name: "settings changed and custom quality" - when: Cura.SimpleModeSettingsManager.isProfileCustomized && Cura.MachineManager.hasCustomQuality + when: Cura.MachineManager.hasUserSettings && Cura.MachineManager.hasCustomQuality PropertyChanges { target: warning @@ -63,7 +64,6 @@ Item return catalog.i18nc("@info, %1 is the name of the custom profile", "%1 custom profile is active and you overwrote some settings.").arg(profile_name) } } - }, State { @@ -80,7 +80,26 @@ Item }, State { - name: "settings changed" + name: "recommended settings changed" + when: Cura.MachineManager.hasUserSettings + PropertyChanges + { + target: warning + text: + { + var profile_name = Cura.MachineManager.activeQualityOrQualityChangesName; + return catalog.i18nc("@info %1 is the name of a profile", "Recommended settings (for %1) were altered.").arg(profile_name); + } + } + PropertyChanges + { + target: warningIcon + color: UM.Theme.getColor("success") + } + }, + State + { + name: "custom settings changed" when: Cura.SimpleModeSettingsManager.isProfileCustomized PropertyChanges { @@ -110,7 +129,7 @@ Item color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") - enabled: Cura.MachineManager.hasCustomQuality || Cura.SimpleModeSettingsManager.isProfileCustomized + enabled: Cura.MachineManager.hasCustomQuality || Cura.MachineManager.hasUserSettings onClicked: Cura.MachineManager.resetToUseDefaultQuality() UM.ToolTip @@ -145,7 +164,7 @@ Item color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") - enabled: Cura.SimpleModeSettingsManager.isProfileCustomized + enabled: Cura.MachineManager.hasUserSettings onClicked: CuraApplication.showCompareAndSaveProfileChanges ( Cura.MachineManager.hasCustomQuality ? From 591fbb2034ccb00c14514fad7bdbdd532f0aa9bd Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Dec 2022 12:37:34 +0100 Subject: [PATCH 06/15] Outline reset/save buttons properly. part of CURA-9347 --- resources/qml/PrintSetupSelector/ProfileWarningReset.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index bfe1dcba1a..0edc4eb6ab 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -145,7 +145,7 @@ Item Item { id: buttonsSpacer - width: UM.Theme.getSize("action_button_icon").height + width: UM.Theme.getSize("narrow_margin").width anchors.right: compareAndSaveButton.left } From 491c501d8c3b94277794196be6b4f888a802da92 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 14:48:50 +0100 Subject: [PATCH 07/15] Adjust margins and correctly vertical center buttons. CURA-9793 --- .../qml/PrintSetupSelector/Custom/CustomPrintSetup.qml | 2 ++ resources/qml/PrintSetupSelector/ProfileWarningReset.qml | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 5742e12a3c..298ecc1496 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -53,6 +53,7 @@ Item onClicked: menu.opened ? menu.close() : menu.open() anchors.right: profileWarningReset.left + anchors.rightMargin: UM.Theme.getSize("narrow_margin").width width: UM.Theme.getSize("print_setup_big_item").width - profileWarningReset.width height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height hoverEnabled: true @@ -157,6 +158,7 @@ Item id: profileWarningReset width: childrenRect.width anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter fullWarning: false } diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index 0edc4eb6ab..7661943742 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -91,11 +91,6 @@ Item return catalog.i18nc("@info %1 is the name of a profile", "Recommended settings (for %1) were altered.").arg(profile_name); } } - PropertyChanges - { - target: warningIcon - color: UM.Theme.getColor("success") - } }, State { @@ -145,7 +140,7 @@ Item Item { id: buttonsSpacer - width: UM.Theme.getSize("narrow_margin").width + width: UM.Theme.getSize("default_margin").width anchors.right: compareAndSaveButton.left } From 493f82620eb1b9bf194ee574185a3e2c3f545bdd Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 14:57:54 +0100 Subject: [PATCH 08/15] Center Manage Profiles button CURA-9793 --- .../PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml index 1aa10a9b42..646e835cb2 100644 --- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml +++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml @@ -233,18 +233,19 @@ Popup right: parent.right } - height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height + height: textLabel.contentHeight + UM.Theme.getSize("default_margin").height contentItem: Item { width: parent.width - height: childrenRect.height + height: parent.height UM.Label { id: textLabel text: manageProfilesButton.text height: contentHeight + anchors.verticalCenter: parent.verticalCenter } UM.Label { @@ -252,6 +253,7 @@ Popup text: Cura.Actions.manageProfiles.shortcut color: UM.Theme.getColor("text_lighter") height: contentHeight + anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: UM.Theme.getSize("default_margin").width } @@ -266,7 +268,7 @@ Popup Item { width: 2 - height: UM.Theme.getSize("default_radius").width + height: UM.Theme.getSize("default_radius").width } } } From a079c78f76e267352bb17eda421d351940cd76ab Mon Sep 17 00:00:00 2001 From: Joeydelarago Date: Tue, 6 Dec 2022 15:17:31 +0000 Subject: [PATCH 09/15] Applied printer-linter format --- resources/definitions/vzbot_base.def.json | 281 ++++++++++++++-------- 1 file changed, 186 insertions(+), 95 deletions(-) diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json index 44b4566ef5..37f2c987f7 100644 --- a/resources/definitions/vzbot_base.def.json +++ b/resources/definitions/vzbot_base.def.json @@ -1,112 +1,203 @@ { - "name": "VzBot Base", "version": 2, + "name": "VzBot Base", "inherits": "fdmprinter", - "metadata": + "metadata": { "visible": false, "author": "Chris, ckvsoft.at", "manufacturer": "VzBot", "file_formats": "text/x-gcode", - "first_start_actions": ["MachineSettingsAction"], - "machine_extruder_trains": { "0": "vzbot_extruder_0" }, - + "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "variants_name": "Nozzle Size", + "machine_extruder_trains": { "0": "vzbot_extruder_0" }, + "preferred_material": "generic_abs", "preferred_quality_type": "standard", "preferred_variant_name": "0.4mm Nozzle", - "preferred_material": "generic_abs" + "variants_name": "Nozzle Size" }, "overrides": { - "machine_name": { "default_value": "VzBot" }, - "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 330 }, - "machine_height": { "default_value": 400 }, - "gantry_height": { "value": 34 }, - "machine_heated_bed": { "default_value": true }, - "machine_max_acceleration_x": { "default_value": 15000 }, - "machine_max_acceleration_y": { "default_value": 15000 }, - "machine_max_acceleration_z": { "default_value": 2000 }, - "machine_acceleration": { "default_value": 15000 }, - "machine_max_jerk_xy": { "default_value": 20 }, - "machine_max_jerk_z": { "default_value": 1 }, - "machine_max_jerk_e": { "default_value": 60 }, - "machine_steps_per_mm_x": { "default_value": 80 }, - "machine_steps_per_mm_y": { "default_value": 80 }, - "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_endstop_positive_direction_x": { "default_value": true }, - "machine_endstop_positive_direction_y": { "default_value": true }, - "machine_endstop_positive_direction_z": { "default_value": false }, - "machine_feeder_wheel_diameter": { "default_value": 7.5 }, - "machine_head_with_fans_polygon": { "default_value": [ [-35, 65], [-35, -50], [35, -50], [35, 65] ] }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_max_feedrate_e": { "default_value": 120 }, - "machine_gcode_flavor": { "default_value": "Marlin" }, - "machine_start_gcode": { "default_value": "start_print B={material_bed_temperature_layer_0} H={material_print_temperature_layer_0} C={build_volume_temperature}" }, - "machine_end_gcode": { "default_value": "end_print" }, - "adhesion_type": { "default_value": "skirt" }, - "retraction_amount": { "default_value": 0.65 }, - "skirt_brim_minimal_length": { "default_value": 550 }, - "retraction_speed": { "default_value": 45, "maximum_value_warning": 150 }, - "retraction_retract_speed": { "maximum_value_warning": 150 }, - "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 150 }, - "retraction_hop": { "default_value": 0.2 }, - "retraction_combing": { "value": "'noskin'" }, - "z_seam_type": { "value": "'back'" }, - "retraction_combing_max_distance": { "default_value": 10 }, - "travel_avoid_other_parts": { "default_value": false }, - "speed_print": { "value": 300, "maximum_value_warning": 1001 }, - "speed_infill": { "maximum_value_warning": 1001 }, - "speed_travel": { "value": 300, "maximum_value_warning": 1001 }, - "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)", "maximum_value_warning": 1001 }, - "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)", "maximum_value_warning": 1001 }, - "speed_wall": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, - "speed_wall_0": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, - "speed_wall_x": { "value": "math.ceil(speed_print)", "maximum_value_warning": 1001 }, - "speed_topbottom": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, - "speed_roofing": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, - "roofing_layer_count": { "value": 1 }, - "optimize_wall_printing_order": { "default_value": true }, - "infill_enable_travel_optimization": { "default_value": true }, - "infill_sparse_density": { "value": 35 }, - "minimum_polygon_circumference": { "default_value": 0.2 }, - "xy_offset_layer_0": { "value": 0.3 }, - "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factor": { "default_value": 50 }, - "infill_pattern": { "value": "'grid' if infill_sparse_density > 40 else 'cubic'" }, - "bridge_settings_enabled": { "default_value": true }, - "bridge_wall_coast": { "default_value": 10 }, - "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, - "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, - "alternate_extra_perimeter": { "default_value": true }, - "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, - "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" }, - "cool_fan_full_layer": { "value": 4 }, - "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, - "line_width": { "value": "machine_nozzle_size * 1.125" }, - "wall_line_width": { "value": "machine_nozzle_size" }, - "meshfix_maximum_resolution": { "default_value": 0.01 }, - "infill_before_walls": { "default_value": false }, - "skin_monotonic": { "default_value": true }, - "zig_zaggify_infill": { "value": true }, - "min_infill_area": { "default_value": 5.0 }, - "acceleration_enabled": { "default_value": true }, - "acceleration_print": { "default_value": 15000, "maximum_value_warning": 50000 }, - "acceleration_infill": { "maximum_value_warning": 50000 }, - "acceleration_wall": { "maximum_value_warning": 50000 }, - "acceleration_wall_0": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_wall_x": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_travel_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_roofing": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_topbottom": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_travel": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_skirt_brim": { "value": 15000, "maximum_value_warning": 50000 }, - "acceleration_print_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, - "jerk_wall_0": { "value": 10 }, - "jerk_roofing": { "value": 10 } + "acceleration_enabled": { "default_value": true }, + "acceleration_infill": { "maximum_value_warning": 50000 }, + "acceleration_layer_0": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_print": + { + "default_value": 15000, + "maximum_value_warning": 50000 + }, + "acceleration_print_layer_0": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_roofing": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_skirt_brim": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_topbottom": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_travel": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_travel_layer_0": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_wall": { "maximum_value_warning": 50000 }, + "acceleration_wall_0": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "acceleration_wall_x": + { + "maximum_value_warning": 50000, + "value": 15000 + }, + "adhesion_type": { "default_value": "skirt" }, + "alternate_extra_perimeter": { "default_value": true }, + "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, + "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, + "bridge_settings_enabled": { "default_value": true }, + "bridge_wall_coast": { "default_value": 10 }, + "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" }, + "cool_fan_full_layer": { "value": 4 }, + "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, + "gantry_height": { "value": 34 }, + "infill_before_walls": { "default_value": false }, + "infill_enable_travel_optimization": { "default_value": true }, + "infill_pattern": { "value": "'grid' if infill_sparse_density > 40 else 'cubic'" }, + "infill_sparse_density": { "value": 35 }, + "jerk_roofing": { "value": 10 }, + "jerk_wall_0": { "value": 10 }, + "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, + "line_width": { "value": "machine_nozzle_size * 1.125" }, + "machine_acceleration": { "default_value": 15000 }, + "machine_depth": { "default_value": 330 }, + "machine_end_gcode": { "default_value": "end_print" }, + "machine_endstop_positive_direction_x": { "default_value": true }, + "machine_endstop_positive_direction_y": { "default_value": true }, + "machine_endstop_positive_direction_z": { "default_value": false }, + "machine_feeder_wheel_diameter": { "default_value": 7.5 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-35, 65], + [-35, -50], + [35, -50], + [35, 65] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 400 }, + "machine_max_acceleration_x": { "default_value": 15000 }, + "machine_max_acceleration_y": { "default_value": 15000 }, + "machine_max_acceleration_z": { "default_value": 2000 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_max_jerk_e": { "default_value": 60 }, + "machine_max_jerk_xy": { "default_value": 20 }, + "machine_max_jerk_z": { "default_value": 1 }, + "machine_name": { "default_value": "VzBot" }, + "machine_start_gcode": { "default_value": "start_print B={material_bed_temperature_layer_0} H={material_print_temperature_layer_0} C={build_volume_temperature}" }, + "machine_steps_per_mm_x": { "default_value": 80 }, + "machine_steps_per_mm_y": { "default_value": 80 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_width": { "default_value": 330 }, + "meshfix_maximum_resolution": { "default_value": 0.01 }, + "min_infill_area": { "default_value": 5.0 }, + "minimum_polygon_circumference": { "default_value": 0.2 }, + "optimize_wall_printing_order": { "default_value": true }, + "retraction_amount": { "default_value": 0.65 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_combing_max_distance": { "default_value": 10 }, + "retraction_hop": { "default_value": 0.2 }, + "retraction_prime_speed": + { + "maximum_value_warning": 150, + "value": "math.ceil(retraction_speed * 0.4)" + }, + "retraction_retract_speed": { "maximum_value_warning": 150 }, + "retraction_speed": + { + "default_value": 45, + "maximum_value_warning": 150 + }, + "roofing_layer_count": { "value": 1 }, + "skin_monotonic": { "default_value": true }, + "skirt_brim_minimal_length": { "default_value": 550 }, + "speed_infill": { "maximum_value_warning": 1001 }, + "speed_layer_0": + { + "maximum_value_warning": 1001, + "value": "math.ceil(speed_print * 0.25)" + }, + "speed_print": + { + "maximum_value_warning": 1001, + "value": 300 + }, + "speed_roofing": + { + "maximum_value_warning": 1001, + "value": "math.ceil(speed_print * 0.5)" + }, + "speed_topbottom": + { + "maximum_value_warning": 1001, + "value": "math.ceil(speed_print * 0.5)" + }, + "speed_travel": + { + "maximum_value_warning": 1001, + "value": 300 + }, + "speed_travel_layer_0": + { + "maximum_value_warning": 1001, + "value": "math.ceil(speed_travel * 0.4)" + }, + "speed_wall": + { + "maximum_value_warning": 1001, + "value": "math.ceil(speed_print * 0.5)" + }, + "speed_wall_0": + { + "maximum_value_warning": 1001, + "value": "math.ceil(speed_print * 0.5)" + }, + "speed_wall_x": + { + "maximum_value_warning": 1001, + "value": "math.ceil(speed_print)" + }, + "travel_avoid_other_parts": { "default_value": false }, + "wall_line_width": { "value": "machine_nozzle_size" }, + "wall_overhang_angle": { "default_value": 75 }, + "wall_overhang_speed_factor": { "default_value": 50 }, + "xy_offset_layer_0": { "value": 0.3 }, + "z_seam_type": { "value": "'back'" }, + "zig_zaggify_infill": { "value": true } } -} +} \ No newline at end of file From 067a40dbe8fc8d6dabf3db5749a3a425a4f28066 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Dec 2022 17:00:06 +0100 Subject: [PATCH 10/15] Don't just disable the reset/safe buttons, hide them. part of CURA-9347 --- resources/qml/PrintSetupSelector/ProfileWarningReset.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index 7661943742..7d8ac389ee 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -121,6 +121,7 @@ Item verticalCenter: parent.verticalCenter } + visible: enabled color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") @@ -156,6 +157,7 @@ Item verticalCenter: parent.verticalCenter } + visible: enabled color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") From 4ecc0a98bb570385d37bdb148a0cb9f12932f84b Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 6 Dec 2022 17:07:29 +0100 Subject: [PATCH 11/15] Don't show reset for only custom profile when in custom mode. part of CURA-9347 --- resources/qml/PrintSetupSelector/ProfileWarningReset.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index 7d8ac389ee..e7a8f0799d 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -125,7 +125,7 @@ Item color: enabled ? UM.Theme.getColor("accent_1") : UM.Theme.getColor("disabled") hoverColor: UM.Theme.getColor("primary_hover") - enabled: Cura.MachineManager.hasCustomQuality || Cura.MachineManager.hasUserSettings + enabled: (fullWarning && Cura.MachineManager.hasCustomQuality) || Cura.MachineManager.hasUserSettings onClicked: Cura.MachineManager.resetToUseDefaultQuality() UM.ToolTip From 03fac1bc7fd97deab3a1b23cc13abee4b3542d51 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Tue, 6 Dec 2022 18:11:15 +0100 Subject: [PATCH 12/15] Make the width of the ProfileWarningREset 0 when it is hidden. Expand the profile selection dropdown when the ProfileWarningReset is hidden in the custom menu. CURA-9793 --- .../PrintSetupSelector/Custom/CustomPrintSetup.qml | 10 +++++++--- .../qml/PrintSetupSelector/ProfileWarningReset.qml | 11 ++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml index 298ecc1496..41ab40eb31 100644 --- a/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Custom/CustomPrintSetup.qml @@ -52,9 +52,13 @@ Item id: intentSelection onClicked: menu.opened ? menu.close() : menu.open() - anchors.right: profileWarningReset.left - anchors.rightMargin: UM.Theme.getSize("narrow_margin").width - width: UM.Theme.getSize("print_setup_big_item").width - profileWarningReset.width + // Anchoring to the right makes much more sense here, but for some reason this component compresses from the right + // and then expands from the left afterwards. This pushes it left by profileWarningReset.width + // The solution is to anchor from the other direction so this does not happen. + anchors.left: parent.left + // This leftMargin gives us the same spacing as anchoring to the right on profileWarningReset + anchors.leftMargin: parent.width - UM.Theme.getSize("print_setup_big_item").width + width: profileWarningReset.visible ? UM.Theme.getSize("print_setup_big_item").width - profileWarningReset.width - UM.Theme.getSize("default_margin").width : UM.Theme.getSize("print_setup_big_item").width height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height hoverEnabled: true diff --git a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml index e7a8f0799d..c44fcc8cc2 100644 --- a/resources/qml/PrintSetupSelector/ProfileWarningReset.qml +++ b/resources/qml/PrintSetupSelector/ProfileWarningReset.qml @@ -13,7 +13,8 @@ Item property bool fullWarning: true // <- Can you see the warning icon and the text, or is it just the buttons? height: visible ? UM.Theme.getSize("action_button_icon").height : 0 - visible: Cura.MachineManager.hasUserSettings || Cura.MachineManager.hasCustomQuality + width: visible ? childrenRect.width: 0 + visible: Cura.MachineManager.hasUserSettings || (fullWarning && Cura.MachineManager.hasCustomQuality) Rectangle { @@ -46,7 +47,7 @@ Item { left: warningIcon.right verticalCenter: parent.verticalCenter - leftMargin: UM.Theme.getSize("thin_margin").width + leftMargin: visible ? UM.Theme.getSize("thin_margin").width : 0 } wrapMode: Text.WordWrap @@ -113,7 +114,7 @@ Item { id: resetToDefaultQualityButton height: UM.Theme.getSize("action_button_icon").height - width: height + width: visible ? height : 0 iconSource: UM.Theme.getIcon("ArrowReset") anchors { @@ -141,7 +142,7 @@ Item Item { id: buttonsSpacer - width: UM.Theme.getSize("default_margin").width + width: compareAndSaveButton.visible ? UM.Theme.getSize("default_margin").width : 0 anchors.right: compareAndSaveButton.left } @@ -149,7 +150,7 @@ Item { id: compareAndSaveButton height: UM.Theme.getSize("action_button_icon").height - width: height + width: visible ? height : 0 iconSource: UM.Theme.getIcon("Save") anchors { From e9136f654de3ca553b8aee7737b64e2ba77a111d Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 7 Dec 2022 10:06:45 +0100 Subject: [PATCH 13/15] Show OS in run-name --- .github/workflows/cura-all-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index 25f56063af..e0d69bf04c 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -1,5 +1,5 @@ name: Cura All Installers -run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }} +run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then "Windows" }} ${{ if inputs.build_macos then "Mac" }} ${{ if inputs.build_linux then "Linux" }} on: workflow_dispatch: From d876317df68003c8eb2de99bf772872d75afa3f4 Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 7 Dec 2022 10:08:24 +0100 Subject: [PATCH 14/15] Show OS in run-name --- .github/workflows/cura-all-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index e0d69bf04c..a1fb34f936 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -1,5 +1,5 @@ name: Cura All Installers -run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then "Windows" }} ${{ if inputs.build_macos then "Mac" }} ${{ if inputs.build_linux then "Linux" }} +run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then Windows }} ${{ if inputs.build_macos then Mac }} ${{ if inputs.build_linux then Linux }} on: workflow_dispatch: From 333f0e82828e4e2d57e4e435f99928c21b391b62 Mon Sep 17 00:00:00 2001 From: jspijker Date: Wed, 7 Dec 2022 10:09:42 +0100 Subject: [PATCH 15/15] Show OS in run-name --- .github/workflows/cura-all-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index a1fb34f936..e8501875a8 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -1,5 +1,5 @@ name: Cura All Installers -run-name: ${{ inputs.cura_conan_version }} for ${{ if inputs.build_windows then Windows }} ${{ if inputs.build_macos then Mac }} ${{ if inputs.build_linux then Linux }} +run-name: ${{ inputs.cura_conan_version }} for Windows ${{ inputs.build_windows }}, MacOS ${{ inputs.build_macos }}, Linux ${{ inputs.build_linux }} on: workflow_dispatch: