From 01107f8f060bb2fb5e4eaafc17b66a972758b94b Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 18 Nov 2013 11:54:56 +0100 Subject: [PATCH] Added fix for scale to max for UM2 Scale to max should always give a viable option. It wil not be the *best* option. Pretty nasty implementation. --- Cura/gui/sceneView.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index 209a0084..c757bf62 100644 --- a/Cura/gui/sceneView.py +++ b/Cura/gui/sceneView.py @@ -375,7 +375,20 @@ class SceneView(openglGui.glGuiPanel): def OnScaleMax(self, button): if self._selectedObj is None: return - self._selectedObj.scaleUpTo(self._machineSize - numpy.array(profile.calculateObjectSizeOffsets() + [0.0], numpy.float32) * 2 - numpy.array([1,1,1], numpy.float32)) + machine = profile.getMachineSetting('machine_type') + self._selectedObj.setPosition(numpy.array([0.0, 0.0])) + self._scene.pushFree() + #self.sceneUpdated() + if machine == "ultimaker2": + self._selectedObj.setPosition(numpy.array([0.0,-22.5])) + + self._selectedObj.scaleUpTo(self._machineSize - numpy.array(profile.calculateObjectSizeOffsets() + [0.0], numpy.float32) * 2 - numpy.array([1,1,1], numpy.float32)) + self._selectedObj.setPosition(numpy.array([0.0,-15])) + self._scene.pushFree() + else: + self._selectedObj.setPosition(numpy.array([0.0, 0.0])) + self._scene.pushFree() + self._selectedObj.scaleUpTo(self._machineSize - numpy.array(profile.calculateObjectSizeOffsets() + [0.0], numpy.float32) * 2 - numpy.array([1,1,1], numpy.float32)) self._scene.pushFree() self._selectObject(self._selectedObj) self.updateProfileToControls() -- 2.30.2