From c25a733768da9d5be3def370ccf848f790560cb0 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 28 Jun 2018 14:45:33 +0200 Subject: [PATCH 1/3] Fix weights of the UMO global quality profiles. --- .../ultimaker_original/umo_global_Coarse_Quality.inst.cfg | 2 +- .../ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg | 2 +- .../quality/ultimaker_original/umo_global_High_Quality.inst.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg index 881b6cae30..30815df9f1 100644 --- a/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Coarse_Quality.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_original setting_version = 4 type = quality quality_type = coarse -weight = -4 +weight = -3 global_quality = True [values] diff --git a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg index 03c974185d..10941b96af 100644 --- a/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_Extra_Coarse_Quality.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_original setting_version = 4 type = quality quality_type = extra coarse -weight = -3 +weight = -4 global_quality = True [values] diff --git a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg index be2814891c..743ea034d4 100644 --- a/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_original/umo_global_High_Quality.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker_original setting_version = 4 type = quality quality_type = high -weight = 0 +weight = 1 global_quality = True [values] From 6737dfac470f80f358926c63490a40976a9997ca Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 28 Jun 2018 16:09:00 +0200 Subject: [PATCH 2/3] Protect against crashes when the temporary file is still in use by another process. Contributes to CURA-5516. --- cura/CuraPackageManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index c7cb1b96bf..59a9231bd1 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -330,7 +330,10 @@ class CuraPackageManager(QObject): self.__installPackageFiles(package_id, src_dir_path, dst_dir_path) # Remove the file - os.remove(filename) + try: + os.remove(filename) + except Exception: + Logger.log("w", "Tried to delete file [%s], but it failed", filename) # Move the info to the installed list of packages only when it succeeds self._installed_package_dict[package_id] = self._to_install_package_dict[package_id] From 56c7c6f2b2e629c2439aee528812e53eb6a58e7f Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 29 Jun 2018 10:41:54 +0200 Subject: [PATCH 3/3] CURA-5518 Check whether the the findDefinitionContainers return any element or not. --- cura/Settings/MachineManager.py | 5 ++++- plugins/3MFReader/WorkspaceDialog.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 124cff73d8..4aa8235a99 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -216,7 +216,10 @@ class MachineManager(QObject): @pyqtProperty(int, constant=True) def totalNumberOfSettings(self) -> int: - return len(ContainerRegistry.getInstance().findDefinitionContainers(id = "fdmprinter")[0].getAllKeys()) + general_definition_containers = ContainerRegistry.getInstance().findDefinitionContainers(id = "fdmprinter") + if not general_definition_containers: + return 0 + return len(general_definition_containers[0].getAllKeys()) def _onGlobalContainerChanged(self) -> None: if self._global_container_stack: diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index da682a6fc0..6e1cbb2019 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -187,7 +187,10 @@ class WorkspaceDialog(QObject): @pyqtProperty(int, constant = True) def totalNumberOfSettings(self): - return len(ContainerRegistry.getInstance().findDefinitionContainers(id="fdmprinter")[0].getAllKeys()) + general_definition_containers = ContainerRegistry.getInstance().findDefinitionContainers(id = "fdmprinter") + if not general_definition_containers: + return 0 + return len(general_definition_containers[0].getAllKeys()) @pyqtProperty(int, notify = numVisibleSettingsChanged) def numVisibleSettings(self):