From 111430c9c26293a64016403a12c27e3fc8b33f18 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 9 May 2019 11:37:59 +0200 Subject: [PATCH 1/2] Catch scroll events and not propagate them to the main view --- resources/qml/Toolbar.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml index 33481b9183..c2a70143c3 100644 --- a/resources/qml/Toolbar.qml +++ b/resources/qml/Toolbar.qml @@ -182,6 +182,8 @@ Item MouseArea //Catch all mouse events (so scene doesnt handle them) { anchors.fill: parent + acceptedButtons: Qt.NoButton + onWheel: wheel.accepted = true } Loader From d5d37ccf0fdcc056f46611f6ed9ea719b66eceae Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 9 May 2019 15:04:14 +0200 Subject: [PATCH 2/2] Check if auto slicing needs to be done slightly more frequent Otherwise it might get stuck in some cases if you loaded a object after loading a gcode CURA-6422 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index f57aee190f..bdccfca15e 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -517,9 +517,6 @@ class CuraEngineBackend(QObject, Backend): self._build_plates_to_be_sliced.append(build_plate_number) self.printDurationMessage.emit(source_build_plate_number, {}, []) self.processingProgress.emit(0.0) - self.setState(BackendState.NotStarted) - # if not self._use_timer: - # With manually having to slice, we want to clear the old invalid layer data. self._clearLayerData(build_plate_changed) self._invokeSlice() @@ -563,10 +560,10 @@ class CuraEngineBackend(QObject, Backend): ## Convenient function: mark everything to slice, emit state and clear layer data def needsSlicing(self) -> None: + self.determineAutoSlicing() self.stopSlicing() self.markSliceAll() self.processingProgress.emit(0.0) - self.setState(BackendState.NotStarted) if not self._use_timer: # With manually having to slice, we want to clear the old invalid layer data. self._clearLayerData()