From 90726ecbff305d044dc63e5829134351e3e624f0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 1 Nov 2018 15:28:08 +0100 Subject: [PATCH 1/3] Fix situation where the setting visibility model could cause a crash. Yay for crash logging --- cura/Machines/Models/SettingVisibilityPresetsModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Machines/Models/SettingVisibilityPresetsModel.py b/cura/Machines/Models/SettingVisibilityPresetsModel.py index 2702001d8a..79131521f2 100644 --- a/cura/Machines/Models/SettingVisibilityPresetsModel.py +++ b/cura/Machines/Models/SettingVisibilityPresetsModel.py @@ -140,7 +140,7 @@ class SettingVisibilityPresetsModel(QObject): item_to_set = self._active_preset_item if matching_preset_item is None: # The new visibility setup is "custom" should be custom - if self._active_preset_item.presetId == "custom": + if self._active_preset_item is None or self._active_preset_item.presetId == "custom": # We are already in custom, just save the settings self._preferences.setValue("cura/custom_visible_settings", visibility_string) else: From 93afaf64c65f5778c1cafa8d0774ff0d347df8be Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 5 Nov 2018 13:28:14 +0100 Subject: [PATCH 2/3] Strip the old "curaproject" extension from project name CURA-5896 --- cura/PrintInformation.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py index 21b57d0806..0d6418d388 100644 --- a/cura/PrintInformation.py +++ b/cura/PrintInformation.py @@ -369,6 +369,11 @@ class PrintInformation(QObject): else: self._base_name = "" + # Strip the old "curaproject" extension from the name + OLD_CURA_PROJECT_EXT = ".curaproject" + if self._base_name.endswith(OLD_CURA_PROJECT_EXT): + self._base_name = self._base_name[:len(self._base_name) - len(OLD_CURA_PROJECT_EXT)] + self._updateJobName() @pyqtProperty(str, fset = setBaseName, notify = baseNameChanged) From 3f1e0cc61013b4626c09a7b8995504f6bb0b2c01 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 5 Nov 2018 14:25:16 +0100 Subject: [PATCH 3/3] Fix delayed convex hull recomputation CURA-5896 If the current tool operation is still active, we need to delay the convex hull recomputation after the tool becomes inactive. --- cura/Scene/ConvexHullDecorator.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 52e687832c..39124c5ba3 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -142,6 +142,12 @@ class ConvexHullDecorator(SceneNodeDecorator): controller = Application.getInstance().getController() root = controller.getScene().getRoot() if self._node is None or controller.isToolOperationActive() or not self.__isDescendant(root, self._node): + # If the tool operation is still active, we need to compute the convex hull later after the controller is + # no longer active. + if controller.isToolOperationActive(): + self.recomputeConvexHullDelayed() + return + if self._convex_hull_node: self._convex_hull_node.setParent(None) self._convex_hull_node = None