From: daid Date: Fri, 7 Mar 2014 18:36:20 +0000 (+0100) Subject: Fix object placement and scale to max. X-Git-Tag: 14.03~16 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7591c803f0d63766b8fef0df6ee1a4a1e18c8c51;p=cura.git Fix object placement and scale to max. --- diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py index ea425f5b..4b87954e 100644 --- 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 84964067..358d031f 100644 --- 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))