chiark / gitweb /
Added fix for scale to max for UM2
authorJaime van Kessel <nallath@gmail.com>
Mon, 18 Nov 2013 10:54:56 +0000 (11:54 +0100)
committerJaime van Kessel <nallath@gmail.com>
Mon, 18 Nov 2013 10:54:56 +0000 (11:54 +0100)
Scale to max should always give a viable option. It wil not be the
*best* option. Pretty nasty implementation.

Cura/gui/sceneView.py

index 209a00849c56a1e24823c1ec068878db7c2acb4c..c757bf622993afad49c4a85d0687a78983d8ce94 100644 (file)
@@ -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()