Fix object print order bug for UM2.

[cura.git] / Cura / util / objectScene.py

diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index 389d23d00bc2edc932e1877510f947fe688d1641..f73016ac2b368858e7832b0abb192996b73afc96 100644 (file)
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -77,7 +77,7 @@ class _objectOrderFinder(object):
                size = self._scene._objectList[idx].getSize()
 
                if self._leftToRight:
-                       if addPos[0] - addSize[0] / 2 - self._offset[0] <= pos[0] + size[0] / 2:
+                       if addPos[0] - addSize[0] / 2 - self._offset[0] >= pos[0] + size[0] / 2:
                                return False
                else:
                        if addPos[0] + addSize[0] / 2 + self._offset[0] <= pos[0] - size[0] / 2:
@@ -87,7 +87,7 @@ class _objectOrderFinder(object):
                        if addPos[1] - addSize[1] / 2 - self._offset[1] >= pos[1] + size[1] / 2:
                                return False
                else:
-                       if addPos[1] + addSize[1] / 2 + self._offset[1] >= pos[1] - size[1] / 2:
+                       if addPos[1] + addSize[1] / 2 + self._offset[1] <= pos[1] - size[1] / 2:
                                return False
 
                return True
@@ -125,8 +125,8 @@ class Scene(object):
                self._findFreePositionFor(obj)
                self._objectList.append(obj)
                self.pushFree()
-               if numpy.max(obj.getSize()[0:2]) > numpy.max(self._machineSize[0:2]) * 1.5:
-                       scale = numpy.max(self._machineSize[0:2]) * 1.5 / numpy.max(obj.getSize()[0:2])
+               if numpy.max(obj.getSize()[0:2]) > numpy.max(self._machineSize[0:2]) * 2.5:
+                       scale = numpy.max(self._machineSize[0:2]) * 2.5 / numpy.max(obj.getSize()[0:2])
                        matrix = [[scale,0,0], [0, scale, 0], [0, 0, scale]]
                        obj.applyMatrix(numpy.matrix(matrix, numpy.float64))