From 7c9b190bee43bb578eef6d3efc8b4551faafcf5f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Sep 2015 13:47:52 +0200 Subject: [PATCH 1/3] Split up onChanged code a bit for easier debugging --- plugins/CuraEngineBackend/CuraEngineBackend.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 8fc6513e80..68d45d0b74 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -223,10 +223,16 @@ class CuraEngineBackend(Backend): self._socket.sendMessage(slice_message) def _onSceneChanged(self, source): - if (type(source) is not SceneNode) or (source is self._scene.getRoot()) or (source.getMeshData() is None): + if type(source) is not SceneNode: return - if(source.getMeshData().getVertices() is None): + if source is self._scene.getRoot(): + return + + if source.getMeshData() is None: + return + + if source.getMeshData().getVertices() is None: return self._onChanged() From b770979be52adea1e8739b8bd21cdeb9eee27f29 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Sep 2015 13:50:10 +0200 Subject: [PATCH 2/3] Force scene change event upon file load through commandline parameters Fixes Ultimaker/Cura#409 --- cura/CuraApplication.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 5d67226c5b..ab3da92db0 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -529,6 +529,8 @@ class CuraApplication(QtApplication): op = AddSceneNodeOperation(node, self.getController().getScene().getRoot()) op.push() + self.getController().getScene().sceneChanged.emit(node) #Force scene change. + def _onJobFinished(self, job): if type(job) is not ReadMeshJob or not job.getResult(): return From 82ceccd5be2de766026936add146515eb1add4a0 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 22 Sep 2015 14:12:13 +0200 Subject: [PATCH 3/3] Fixed size of head with fans for UMO2 family --- resources/machines/ultimaker2.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index e3bfa9e9c7..99f2247b0e 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -43,19 +43,19 @@ "default": [ [ -40, - 30 + 10 ], [ -40, - -10 + -30 ], [ 60, - -10 + 10 ], [ 60, - 30 + -30 ] ] },