Fix object placement and scale to max.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index ea425f5bed2bad8af68bc5fee70c00fb23656da6..4b87954e3eac9889e226020b34fc1837e9bc6200 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -433,13 +433,13 @@ class SceneView(openglGui.glGuiPanel):
                if machine == "ultimaker2":
                        #This is bad and Jaime should feel bad!
                        self._selectedObj.setPosition(numpy.array([0.0,-10.0]))
-                       self._selectedObj.scaleUpTo(self._machineSize - numpy.array(profile.calculateObjectSizeOffsets() + [0.0], numpy.float32) * 2 - numpy.array([1,1,1], numpy.float32))
+                       self._selectedObj.scaleUpTo(self._machineSize - numpy.array(profile.calculateObjectSizeOffsets() + [0.0], numpy.float32) * 2 - numpy.array([3,3,3], numpy.float32))
                        self._selectedObj.setPosition(numpy.array([0.0,0.0]))
                        self._scene.pushFree(self._selectedObj)
                else:
                        self._selectedObj.setPosition(numpy.array([0.0, 0.0]))
                        self._scene.pushFree(self._selectedObj)
-                       self._selectedObj.scaleUpTo(self._machineSize - numpy.array(profile.calculateObjectSizeOffsets() + [0.0], numpy.float32) * 2 - numpy.array([1,1,1], numpy.float32))
+                       self._selectedObj.scaleUpTo(self._machineSize - numpy.array(profile.calculateObjectSizeOffsets() + [0.0], numpy.float32) * 2 - numpy.array([3,3,3], numpy.float32))
                self._scene.pushFree(self._selectedObj)
                self._selectObject(self._selectedObj)
                self.updateProfileToControls()

diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index 8496406752fcb380da43cc2d2c3a2e6eba4950ff..358d031fbf5921bdf466e97d6a83d6e9c25a0880 100644 (file)
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -280,9 +280,9 @@ class Scene(object):
                for a in self._objectList:
                        p = a.getPosition()
                        if self._oneAtATime:
-                               s = (a.getSize()[0:2] + obj.getSize()[0:2]) / 2 + self._sizeOffsets + self._headSizeOffsets + numpy.array([3,3], numpy.float32)
+                               s = (a.getSize()[0:2] + obj.getSize()[0:2]) / 2 + self._sizeOffsets + self._headSizeOffsets + numpy.array([4,4], numpy.float32)
                        else:
-                               s = (a.getSize()[0:2] + obj.getSize()[0:2]) / 2 + numpy.array([3,3], numpy.float32)
+                               s = (a.getSize()[0:2] + obj.getSize()[0:2]) / 2 + numpy.array([4,4], numpy.float32)
                        posList.append(p + s * ( 1.0, 1.0))
                        posList.append(p + s * ( 0.0, 1.0))
                        posList.append(p + s * (-1.0, 1.0))