From 62ca661d0ef17d2395c452785e0046a6df597d9c Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 25 Jun 2018 15:27:53 +0200 Subject: [PATCH 1/3] CURA-5496 Remove wrong settings from the UM2 global profiles. --- resources/quality/ultimaker2/um2_fast.inst.cfg | 7 ------- resources/quality/ultimaker2/um2_high.inst.cfg | 2 -- 2 files changed, 9 deletions(-) diff --git a/resources/quality/ultimaker2/um2_fast.inst.cfg b/resources/quality/ultimaker2/um2_fast.inst.cfg index 99ddb540cc..278c76c59b 100644 --- a/resources/quality/ultimaker2/um2_fast.inst.cfg +++ b/resources/quality/ultimaker2/um2_fast.inst.cfg @@ -11,11 +11,4 @@ weight = -1 global_quality = True [values] -infill_sparse_density = 10 layer_height = 0.15 -cool_min_layer_time = 3 -speed_wall_0 = 40 -speed_wall_x = 80 -speed_infill = 100 -wall_thickness = 1 -speed_topbottom = 30 diff --git a/resources/quality/ultimaker2/um2_high.inst.cfg b/resources/quality/ultimaker2/um2_high.inst.cfg index f54700bf70..489bb30d52 100644 --- a/resources/quality/ultimaker2/um2_high.inst.cfg +++ b/resources/quality/ultimaker2/um2_high.inst.cfg @@ -12,5 +12,3 @@ global_quality = True [values] layer_height = 0.06 -speed_topbottom = 15 -speed_infill = 80 From 9689104a2d0dbcbd773b6148f223d23fdbf103ae Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Mon, 25 Jun 2018 15:58:13 +0200 Subject: [PATCH 2/3] CURA-5496 Change the ultimaker original profiles by removing the 0.3 and adding the 0.6mm. layer heigh. --- ...Quality.inst.cfg => um2p_global_Coarse_Quality.inst.cfg} | 4 ++-- .../ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg | 2 +- ...y.inst.cfg => um2p_global_Extra_Coarse_Quality.inst.cfg} | 6 +++--- ..._Quality.inst.cfg => umo_global_Coarse_Quality.inst.cfg} | 4 ++-- .../ultimaker_original/umo_global_Draft_Quality.inst.cfg | 2 +- ...ty.inst.cfg => umo_global_Extra_Coarse_Quality.inst.cfg} | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) rename resources/quality/ultimaker2_plus/{um2p_global_Superdraft_Quality.inst.cfg => um2p_global_Coarse_Quality.inst.cfg} (78%) rename resources/quality/ultimaker2_plus/{um2p_global_Verydraft_Quality.inst.cfg => um2p_global_Extra_Coarse_Quality.inst.cfg} (65%) rename resources/quality/ultimaker_original/{umo_global_Superdraft_Quality.inst.cfg => umo_global_Coarse_Quality.inst.cfg} (78%) rename resources/quality/ultimaker_original/{umo_global_Verydraft_Quality.inst.cfg => umo_global_Extra_Coarse_Quality.inst.cfg} (65%) diff --git a/resources/quality/ultimaker2_plus/um2p_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg similarity index 78% rename from resources/quality/ultimaker2_plus/um2p_global_Superdraft_Quality.inst.cfg rename to resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg index 653ec511f1..2ea02f7680 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Coarse_Quality.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Sprint +name = Coarse Quality definition = ultimaker2_plus [metadata] setting_version = 4 type = quality -quality_type = superdraft +quality_type = coarse weight = -4 global_quality = True diff --git a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg index aa37772872..9c8c52edb7 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Draft_Quality.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Fast +name = Draft Quality definition = ultimaker2_plus [metadata] diff --git a/resources/quality/ultimaker2_plus/um2p_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg similarity index 65% rename from resources/quality/ultimaker2_plus/um2p_global_Verydraft_Quality.inst.cfg rename to resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg index 0c1e2e67a7..40802d447d 100644 --- a/resources/quality/ultimaker2_plus/um2p_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_global_Extra_Coarse_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] version = 4 -name = Extra Fast +name = Extra Coarse Quality definition = ultimaker2_plus [metadata] setting_version = 4 type = quality -quality_type = verydraft +quality_type = extra coarse weight = -3 global_quality = True [values] -layer_height = 0.3 +layer_height = 0.6 diff --git a/resources/quality/ultimaker_original/umo_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg similarity index 78% rename from resources/quality/ultimaker_original/umo_global_Superdraft_Quality.inst.cfg rename to resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg index afa165b559..881b6cae30 100644 --- a/resources/quality/ultimaker_original/umo_global_Superdraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Sprint +name = Coarse Quality definition = ultimaker_original [metadata] setting_version = 4 type = quality -quality_type = superdraft +quality_type = coarse weight = -4 global_quality = True diff --git a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg index 038c80a00b..81059adba8 100644 --- a/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Draft_Quality.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Fast +name = Draft Quality definition = ultimaker_original [metadata] diff --git a/resources/quality/ultimaker_original/umo_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg similarity index 65% rename from resources/quality/ultimaker_original/umo_global_Verydraft_Quality.inst.cfg rename to resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg index 3438605160..03c974185d 100644 --- a/resources/quality/ultimaker_original/umo_global_Verydraft_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] version = 4 -name = Extra Fast +name = Extra Coarse Quality definition = ultimaker_original [metadata] setting_version = 4 type = quality -quality_type = verydraft +quality_type = extra coarse weight = -3 global_quality = True [values] -layer_height = 0.3 +layer_height = 0.6 From 36c25a29a8e3fb351d60821752f1d0b8966a515d Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 27 Jun 2018 11:04:53 +0200 Subject: [PATCH 3/3] CURA-5508 Add protection before reading a file that may not exist. --- cura/CuraPackageManager.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 1ec9e2d993..c7cb1b96bf 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -299,16 +299,15 @@ class CuraPackageManager(QObject): filename = installation_package_data["filename"] package_id = package_info["package_id"] - - if not os.path.exists(filename): - Logger.log("w", "Package [%s] file '%s' is missing, cannot install this package", package_id, filename) - return - Logger.log("i", "Installing package [%s] from file [%s]", package_id, filename) # remove it first and then install self._purgePackage(package_id) + if not os.path.exists(filename): + Logger.log("w", "Package [%s] file '%s' is missing, cannot install this package", package_id, filename) + return + # Install the package with zipfile.ZipFile(filename, "r") as archive: @@ -341,6 +340,10 @@ class CuraPackageManager(QObject): # Gets package information from the given file. def getPackageInfo(self, filename: str) -> Dict[str, Any]: + if not os.path.exists(filename): + Logger.log("w", "Package file '%s' is missing, cannot get info from this package", filename) + return {} + with zipfile.ZipFile(filename) as archive: try: # All information is in package.json @@ -354,6 +357,10 @@ class CuraPackageManager(QObject): # Gets the license file content if present in the given package file. # Returns None if there is no license file found. def getPackageLicense(self, filename: str) -> Optional[str]: + if not os.path.exists(filename): + Logger.log("w", "Package file '%s' is missing, cannot get license from this package", filename) + return None + license_string = None with zipfile.ZipFile(filename) as archive: # Go through all the files and use the first successful read as the result