GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 19:05:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.10'

Browse Source
This commit is contained in:
Ghostkeeper 2021-06-25 14:16:23 +02:00
commit e296b0897b
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
32 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/Backups/Backup.py
View File

@ -193,14 +193,13 @@ class Backup:
Logger.log("d", "Removing current data in location: %s", target_path) Logger.log("d", "Removing current data in location: %s", target_path)
Resources.factoryReset() Resources.factoryReset()
Logger.log("d", "Extracting backup to location: %s", target_path) Logger.log("d", "Extracting backup to location: %s", target_path)
try:
name_list = archive.namelist() name_list = archive.namelist()
for archive_filename in name_list: for archive_filename in name_list:
try:
archive.extract(archive_filename, target_path) archive.extract(archive_filename, target_path)
CuraApplication.getInstance().processEvents()
except (PermissionError, EnvironmentError): except (PermissionError, EnvironmentError):
Logger.logException("e", "Unable to extract the backup due to permission or file system errors.") Logger.logException("e", f"Unable to extract the file {archive_filename} from the backup due to permission or file system errors.")
return False CuraApplication.getInstance().processEvents()
return True return True
def _obfuscate(self) -> Dict[str, str]: def _obfuscate(self) -> Dict[str, str]:

1
plugins/CuraDrive/src/DrivePluginExtension.py
View File

@ -81,6 +81,7 @@ class DrivePluginExtension(QObject, Extension):
self._drive_window.show() self._drive_window.show()
def _onApplicationShuttingDown(self): def _onApplicationShuttingDown(self):
if self._drive_window:
self._drive_window.hide() self._drive_window.hide()
def _autoBackup(self) -> None: def _autoBackup(self) -> None:

7
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 Ultimaker B.V. # Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from ..Script import Script from ..Script import Script
@ -520,6 +520,11 @@ class PauseAtHeight(Script):
# reset extrude value to pre pause value # reset extrude value to pre pause value
prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" prepend_gcode += self.putValue(G = 92, E = current_e) + "\n"
elif redo_layer:
# All other options reset the E value to what it was before the pause because E things were added.
# If it's not yet reset, it still needs to be reset if there were any redo layers.
prepend_gcode += self.putValue(G = 92, E = current_e) + "\n"
layer = prepend_gcode + layer layer = prepend_gcode + layer
# Override the data of this layer with the # Override the data of this layer with the

2
resources/quality/ultimaker2_plus_connect/um2pc_petg_0.25_normal.inst.cfg
View File

@ -21,4 +21,4 @@ speed_layer_0 = 30
speed_print = 30 speed_print = 30
top_bottom_thickness = 0.72 top_bottom_thickness = 0.72
wall_thickness = 0.88 wall_thickness = 0.88
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8

2
resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_draft.inst.cfg
View File

@ -27,4 +27,4 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45) speed_infill = =math.ceil(speed_print * 45 / 45)
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8

2
resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_fast.inst.cfg
View File

@ -27,4 +27,4 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall_x = =math.ceil(speed_print * 40 / 45) speed_wall_x = =math.ceil(speed_print * 40 / 45)
speed_infill = =math.ceil(speed_print * 45 / 45) speed_infill = =math.ceil(speed_print * 45 / 45)
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8

2
resources/quality/ultimaker2_plus_connect/um2pc_petg_0.4_normal.inst.cfg
View File

@ -22,4 +22,4 @@ speed_print = 45
speed_wall = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 30 / 45)
top_bottom_thickness = 0.8 top_bottom_thickness = 0.8
wall_thickness = 1.05 wall_thickness = 1.05
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8

2
resources/quality/ultimaker2_plus_connect/um2pc_petg_0.6_normal.inst.cfg
View File

@ -21,4 +21,4 @@ speed_layer_0 = 30
speed_print = 40 speed_print = 40
top_bottom_thickness = 1.2 top_bottom_thickness = 1.2
wall_thickness = 1.59 wall_thickness = 1.59
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8

2
resources/quality/ultimaker2_plus_connect/um2pc_petg_0.8_normal.inst.cfg
View File

@ -21,4 +21,4 @@ speed_layer_0 = 30
speed_print = 40 speed_print = 40
top_bottom_thickness = 1.2 top_bottom_thickness = 1.2
wall_thickness = 2.1 wall_thickness = 2.1
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8

2
resources/quality/ultimaker3/um3_aa0.25_PETG_Normal_Quality.inst.cfg
View File

@ -18,5 +18,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8 top_bottom_thickness = 0.8
wall_thickness = 0.92 wall_thickness = 0.92
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
retraction_combing_max_distance = 40 retraction_combing_max_distance = 8
retraction_combing = all retraction_combing = all

2
resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg
View File

@ -23,5 +23,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 60)
speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall = =math.ceil(speed_print * 45 / 60)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
wall_thickness = 1 wall_thickness = 1
retraction_combing_max_distance = 40 retraction_combing_max_distance = 8
retraction_combing = all retraction_combing = all

2
resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg
View File

@ -23,5 +23,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60)
speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall = =math.ceil(speed_print * 40 / 60)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
speed_infill = =math.ceil(speed_print * 50 / 60) speed_infill = =math.ceil(speed_print * 50 / 60)
retraction_combing_max_distance = 40 retraction_combing_max_distance = 8
retraction_combing = all retraction_combing = all

2
resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg
View File

@ -23,5 +23,5 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)
speed_wall = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55)
speed_infill = =math.ceil(speed_print * 45 / 55) speed_infill = =math.ceil(speed_print * 45 / 55)
retraction_combing_max_distance = 40 retraction_combing_max_distance = 8
retraction_combing = all retraction_combing = all

2
resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg
View File

@ -20,5 +20,5 @@ prime_tower_enable = True
speed_print = 40 speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40) speed_wall = =math.ceil(speed_print * 30 / 40)
retraction_combing_max_distance = 40 retraction_combing_max_distance = 8
retraction_combing = all retraction_combing = all

2
resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg
View File

@ -22,5 +22,5 @@ speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
retraction_combing_max_distance = 40 retraction_combing_max_distance = 8
retraction_combing = all retraction_combing = all

2
resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg
View File

@ -21,5 +21,5 @@ prime_tower_enable = True
speed_print = 40 speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40) speed_wall = =math.ceil(speed_print * 30 / 40)
retraction_combing_max_distance = 40 retraction_combing_max_distance = 8
retraction_combing = all retraction_combing = all

2
resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg
View File

@ -12,7 +12,7 @@ material = generic_petg
variant = AA 0.25 variant = AA 0.25
[values] [values]
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
retraction_extrusion_window = 0.5 retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55) speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)

2
resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg
View File

@ -15,7 +15,7 @@ variant = AA 0.4
material_print_temperature = =default_material_print_temperature + 5 material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature material_initial_print_temperature = =material_print_temperature
material_final_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 5
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
skin_overlap = 20 skin_overlap = 20
speed_print = 60 speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60)

2
resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg
View File

@ -16,7 +16,7 @@ cool_min_speed = 7
material_print_temperature = =default_material_print_temperature material_print_temperature = =default_material_print_temperature
material_initial_print_temperature = =material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 60 speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60)

2
resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg
View File

@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 50 speed_print = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50)

2
resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg
View File

@ -17,7 +17,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 55 speed_print = 55
speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)

2
resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg
View File

@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = True prime_tower_enable = True
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 40 speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40) speed_wall = =math.ceil(speed_print * 30 / 40)

2
resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
View File

@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = True prime_tower_enable = True
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 45 speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall = =math.ceil(speed_print * 40 / 45)

2
resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg
View File

@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = True prime_tower_enable = True
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 40 speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40) speed_wall = =math.ceil(speed_print * 30 / 40)

2
resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg
View File

@ -12,7 +12,7 @@ material = generic_petg
variant = AA 0.25 variant = AA 0.25
[values] [values]
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
retraction_extrusion_window = 0.5 retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55) speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)

2
resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg
View File

@ -15,7 +15,7 @@ variant = AA 0.4
material_print_temperature = =default_material_print_temperature + 5 material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature material_initial_print_temperature = =material_print_temperature
material_final_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 5
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0
skin_overlap = 20 skin_overlap = 20
speed_print = 60 speed_print = 60

2
resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg
View File

@ -16,7 +16,7 @@ cool_min_speed = 7
material_print_temperature = =default_material_print_temperature material_print_temperature = =default_material_print_temperature
material_initial_print_temperature = =material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 10
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 60 speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60)

2
resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg
View File

@ -18,7 +18,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 10 material_print_temperature = =default_material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 50 speed_print = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50)

2
resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg
View File

@ -17,7 +17,7 @@ machine_nozzle_heat_up_speed = 1.5
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10
material_final_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 15
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 55 speed_print = 55
speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)

2
resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg
View File

@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = True prime_tower_enable = True
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 40 speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40) speed_wall = =math.ceil(speed_print * 30 / 40)

2
resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
View File

@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = True prime_tower_enable = True
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 45 speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall = =math.ceil(speed_print * 40 / 45)

2
resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg
View File

@ -17,7 +17,7 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5
material_standby_temperature = 100 material_standby_temperature = 100
prime_tower_enable = True prime_tower_enable = True
retraction_combing_max_distance = 50 retraction_combing_max_distance = 8
speed_print = 40 speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40) speed_wall = =math.ceil(speed_print * 30 / 40)