diff --git a/plugins/PostProcessingPlugin/Script.py b/plugins/PostProcessingPlugin/Script.py index be661e0889..bdd57a06e0 100644 --- a/plugins/PostProcessingPlugin/Script.py +++ b/plugins/PostProcessingPlugin/Script.py @@ -122,7 +122,7 @@ class Script: if not key in line or (';' in line and line.find(key) > line.find(';')): return default sub_part = line[line.find(key) + 1:] - m = re.search('^-?[0-9]+\.?[0-9]*', sub_part) + m = re.search(r'^-?[0-9]+\.?[0-9]*', sub_part) if m is None: return default try: diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index f502678317..43df766962 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -338,7 +338,7 @@ class PauseAtHeight(Script): nbr_negative_layers += 1 #Track the latest printing temperature in order to resume at the correct temperature. - if re.match("T(\d*)", line): + if re.match(r"T(\d*)", line): current_t = self.getValue(line, "T") m = self.getValue(line, "M") if m is not None and (m == 104 or m == 109) and self.getValue(line, "S") is not None: diff --git a/plugins/UM3NetworkPrinting/src/ExportFileJob.py b/plugins/UM3NetworkPrinting/src/ExportFileJob.py index ac3da65719..1ab493c747 100644 --- a/plugins/UM3NetworkPrinting/src/ExportFileJob.py +++ b/plugins/UM3NetworkPrinting/src/ExportFileJob.py @@ -28,7 +28,7 @@ class ExportFileJob(WriteFileJob): # Determine the filename. job_name = CuraApplication.getInstance().getPrintInformation().jobName - job_name = re.sub("[^\w\-. ()]", "-", job_name) + job_name = re.sub(r"[^\w\-. ()]", "-", job_name) extension = self._mesh_format_handler.preferred_format.get("extension", "") self.setFileName("{}.{}".format(job_name, extension)) diff --git a/resources/definitions/ultimaker_sketch_sprint.def.json b/resources/definitions/ultimaker_sketch_sprint.def.json index a9d97e18f5..0043b17be2 100644 --- a/resources/definitions/ultimaker_sketch_sprint.def.json +++ b/resources/definitions/ultimaker_sketch_sprint.def.json @@ -131,7 +131,7 @@ ] }, "infill_before_walls": { "value": false }, - "infill_line_width": { "value": 0.45 }, + "infill_line_width": { "value": "0.45 if layer_height == 0.2 else 0.4" }, "infill_overlap": { "value": 10 }, "infill_pattern": { "value": "'lines'" }, "infill_sparse_density": { "value": 15 }, diff --git a/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm_draft.inst.cfg b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm_draft.inst.cfg new file mode 100644 index 0000000000..5204072807 --- /dev/null +++ b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm_draft.inst.cfg @@ -0,0 +1,54 @@ +[general] +definition = ultimaker_sketch_sprint +name = Draft +version = 4 + +[metadata] +intent_category = draft +is_experimental = True +material = ultimaker_pla_175 +quality_type = imperial +setting_version = 24 +type = intent +variant = 0.4mm + +[values] +acceleration_layer_0 = 5000 +acceleration_print = 20000 +acceleration_roofing = 5000 +acceleration_topbottom = 10000 +acceleration_travel_layer_0 = 5000 +acceleration_wall_0 = 5000.0 +acceleration_wall_0_roofing = 5000 +acceleration_wall_x = 10000 +acceleration_wall_x_roofing = 5000 +cool_fan_full_at_height = 0.54 +cool_min_layer_time = 2 +cool_min_speed = 50 +cool_min_temperature = 220 +infill_angles = [135] +infill_line_width = 0.4 +infill_overlap = 25 +infill_pattern = zigzag +infill_wipe_dist = 0.05 +initial_layer_line_width_factor = 125 +line_width = 0.4 +material_final_print_temperature = 225 +material_initial_print_temperature = 225 +material_print_temperature = 225 +retraction_hop_enabled = True +seam_overhang_angle = 25 +speed_layer_0 = 70 +speed_print = 270 +speed_roofing = 215 +speed_support_bottom = 100 +speed_support_interface = 215 +speed_topbottom = 215 +speed_wall = 215 +speed_wall_x = 270 +speed_wall_x_roofing = 270 +support_line_width = 0.35 +wall_line_width_x = 0.4 +wall_overhang_angle = 25 +wall_overhang_speed_factor = 15 + diff --git a/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.27mm_draft.inst.cfg b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.27mm_draft.inst.cfg new file mode 100644 index 0000000000..546d69404d --- /dev/null +++ b/resources/intent/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.27mm_draft.inst.cfg @@ -0,0 +1,54 @@ +[general] +definition = ultimaker_sketch_sprint +name = Draft +version = 4 + +[metadata] +intent_category = draft +is_experimental = True +material = ultimaker_tough_pla_175 +quality_type = imperial +setting_version = 24 +type = intent +variant = 0.4mm + +[values] +acceleration_layer_0 = 5000 +acceleration_print = 20000 +acceleration_roofing = 5000 +acceleration_topbottom = 10000 +acceleration_travel_layer_0 = 5000 +acceleration_wall_0 = 5000.0 +acceleration_wall_0_roofing = 5000 +acceleration_wall_x = 10000 +acceleration_wall_x_roofing = 5000 +cool_fan_full_at_height = 0.54 +cool_min_layer_time = 2 +cool_min_speed = 50 +cool_min_temperature = 220 +infill_angles = [135] +infill_line_width = 0.4 +infill_overlap = 25 +infill_pattern = zigzag +infill_wipe_dist = 0.05 +initial_layer_line_width_factor = 125 +line_width = 0.4 +material_final_print_temperature = 225 +material_initial_print_temperature = 225 +material_print_temperature = 225 +retraction_hop_enabled = True +seam_overhang_angle = 25 +speed_layer_0 = 70 +speed_print = 270 +speed_roofing = 215 +speed_support_bottom = 100 +speed_support_interface = 215 +speed_topbottom = 215 +speed_wall = 215 +speed_wall_x = 270 +speed_wall_x_roofing = 270 +support_line_width = 0.35 +wall_line_width_x = 0.4 +wall_overhang_angle = 25 +wall_overhang_speed_factor = 15 + diff --git a/resources/qml/ActionPanel/OutputProcessWidget.qml b/resources/qml/ActionPanel/OutputProcessWidget.qml index 1303dc20a2..c609cd6ca5 100644 --- a/resources/qml/ActionPanel/OutputProcessWidget.qml +++ b/resources/qml/ActionPanel/OutputProcessWidget.qml @@ -10,7 +10,7 @@ import Cura 1.0 as Cura // This element contains all the elements the user needs to visualize the data -// that is gather after the slicing process, such as printint time, material usage, ... +// that is gather after the slicing process, such as printing time, material usage, ... // There are also two buttons: one to previsualize the output layers, and the other to // select what to do with it (such as print over network, save to file, ...) Column diff --git a/resources/qml/Menus/RecentFilesMenu.qml b/resources/qml/Menus/RecentFilesMenu.qml index 19ff681219..93fddd0bf6 100644 --- a/resources/qml/Menus/RecentFilesMenu.qml +++ b/resources/qml/Menus/RecentFilesMenu.qml @@ -2,7 +2,7 @@ // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.15 import UM 1.3 as UM import Cura 1.0 as Cura @@ -30,6 +30,6 @@ Cura.Menu onTriggered: CuraApplication.readLocalFile(modelData) } onObjectAdded: (index, object) => menu.insertItem(index, object) - onObjectRemoved: (object) => menu.removeItem(object) + onObjectRemoved: (index, object) => menu.removeItem(object) } } diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 254ba477bf..c1b36676c7 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -57,7 +57,9 @@ RecommendedSettingSection settingName: "support_structure" propertyRemoveUnusedValue: false updateAllExtruders: false - defaultExtruderIndex: supportExtruderProvider.properties.value + defaultExtruderIndex: supportExtruderProvider.properties.value != undefined ? + supportExtruderProvider.properties.value : + Cura.ExtruderManager.activeExtruderIndex } }, RecommendedSettingItem @@ -92,7 +94,9 @@ RecommendedSettingSection width: parent.width settingName: "support_type" updateAllExtruders: true - defaultExtruderIndex: supportExtruderProvider.properties.value + defaultExtruderIndex: supportExtruderProvider.properties.value != undefined ? + supportExtruderProvider.properties.value : + Cura.ExtruderManager.activeExtruderIndex } } ] diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg new file mode 100644 index 0000000000..f084bc1791 --- /dev/null +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175_0.27mm.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = ultimaker_sketch_sprint +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_pla_175 +quality_type = imperial +setting_version = 24 +type = quality +variant = 0.4mm +weight = -3 + +[values] + diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.27mm.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.27mm.inst.cfg new file mode 100644 index 0000000000..1d7584fd7a --- /dev/null +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-tough-pla-175_0.27mm.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = ultimaker_sketch_sprint +name = Extra Fast - Experimental +version = 4 + +[metadata] +is_experimental = True +material = ultimaker_tough_pla_175 +quality_type = imperial +setting_version = 24 +type = quality +variant = 0.4mm +weight = -3 + +[values] +acceleration_layer_0 = 200 +acceleration_travel_layer_0 = =acceleration_layer_0 +speed_layer_0 = 30 +speed_slowdown_layers = 4 +speed_travel_layer_0 = 150 +wall_0_material_flow_layer_0 = =material_flow * 1.03 +wall_x_material_flow_layer_0 = =material_flow * 0.95 + diff --git a/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_global_Imperial_Quality.inst.cfg b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_global_Imperial_Quality.inst.cfg new file mode 100644 index 0000000000..bef8501e67 --- /dev/null +++ b/resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_global_Imperial_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_sprint +name = Extra Fast +version = 4 + +[metadata] +global_quality = True +quality_type = imperial +setting_version = 24 +type = quality +weight = -2 + +[values] +layer_height = 0.27 + diff --git a/scripts/extract_changelog.py b/scripts/extract_changelog.py index a1a0b251f0..934b963e0a 100644 --- a/scripts/extract_changelog.py +++ b/scripts/extract_changelog.py @@ -13,7 +13,7 @@ if __name__ == "__main__": args.version = args.version[:-2] start_token = f"[{args.version}]" - pattern_stop_log = "\[\d+(\.\d+){1,2}\]" + pattern_stop_log = r"\[\d+(\.\d+){1,2}\]" log_line = False first_chapter = True