Set the clip size to the size in the UM2.

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 15da8947dcd3cdf04604b454074c6880825d2667..d609cd08d9ed314166c494628c2b35f17fdbc8e8 100644 (file)
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -383,10 +383,10 @@ class SceneView(openglGui.glGuiPanel):
                self._scene.pushFree()
                #self.sceneUpdated()
                if machine == "ultimaker2":
-                       self._selectedObj.setPosition(numpy.array([0.0,-22.5]))
-
+                       #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.setPosition(numpy.array([0.0,-15]))
+                       self._selectedObj.setPosition(numpy.array([0.0,0.0]))
                        self._scene.pushFree()
                else:
                        self._selectedObj.setPosition(numpy.array([0.0, 0.0]))
@@ -1350,7 +1350,7 @@ void main(void)
                        glColor4ub(127, 127, 127, 200)
                        #if UM2, draw bat-area zone for head. THe head can't stop there, because its bat-area.
                        #UpperRight
-                       clipWidth = 50
+                       clipWidth = 25
                        clipHeight = 10
                        posX = sx / 2 - clipWidth
                        posY = sy / 2 - clipHeight
@@ -1361,7 +1361,7 @@ void main(void)
                        glVertex3f(posX, posY+clipHeight, 0.1)
                        glEnd()
                        #UpperLeft
-                       clipWidth = 55
+                       clipWidth = 25
                        clipHeight = 10
                        posX = -sx / 2
                        posY = sy / 2 - clipHeight
@@ -1372,7 +1372,7 @@ void main(void)
                        glVertex3f(posX, posY+clipHeight, 0.1)
                        glEnd()
                        #LowerRight
-                       clipWidth = 50
+                       clipWidth = 25
                        clipHeight = 10
                        posX = sx / 2 - clipWidth
                        posY = -sy / 2
@@ -1383,7 +1383,7 @@ void main(void)
                        glVertex3f(posX, posY+clipHeight, 0.1)
                        glEnd()
                        #LowerLeft
-                       clipWidth = 55
+                       clipWidth = 25
                        clipHeight = 10
                        posX = -sx / 2
                        posY = -sy / 2
@@ -1394,8 +1394,6 @@ void main(void)
                        glVertex3f(posX, posY+clipHeight, 0.1)
                        glEnd()
 
-
-
                glDisable(GL_BLEND)
                glDisable(GL_CULL_FACE)
 

diff --git a/Cura/util/objectScene.py b/Cura/util/objectScene.py
index 27e03014e0e64ce4b7714a2d7998a9817598d7ba..ded9d9f1012aecd52e4729e19b5c043ed83c73d3 100644 (file)
--- a/Cura/util/objectScene.py
+++ b/Cura/util/objectScene.py
@@ -232,16 +232,16 @@ class Scene(object):
                machine = profile.getMachineSetting('machine_type')
                if(machine == "ultimaker2"):
                        #lowerRight clip check
-                       if p[0] - s[0] < -self._machineSize[0] / 2 + 50 and p[1] - s[1] < -self._machineSize[1]/2 + 5:
+                       if p[0] - s[0] < -self._machineSize[0] / 2 + 25 and p[1] - s[1] < -self._machineSize[1]/2 + 10:
                                return False
                        #UpperRight
-                       if p[0] - s[0] < -self._machineSize[0] / 2 + 50 and p[1] + s[1] > self._machineSize[1]/2 - 35:
+                       if p[0] - s[0] < -self._machineSize[0] / 2 + 25 and p[1] + s[1] > self._machineSize[1]/2 - 10:
                                return False
                        #LowerLeft
-                       if p[0] + s[0] > self._machineSize[0] / 2 - 55 and p[1] - s[1] < -self._machineSize[1]/2 + 5:
+                       if p[0] + s[0] > self._machineSize[0] / 2 - 25 and p[1] - s[1] < -self._machineSize[1]/2 + 10:
                                return False
                        #UpperLeft
-                       if p[0] + s[0] > self._machineSize[0] / 2 - 55 and p[1] + s[1] > self._machineSize[1]/2 - 35:
+                       if p[0] + s[0] > self._machineSize[0] / 2 - 25 and p[1] + s[1] > self._machineSize[1]/2 - 10:
                                return False
                return True