Replace the line grid with a checkerboard pattern, this looks better and less like...

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index fd62326224ddbeb252d38fea2644f5491317fb2a..8a5deae32c0822933bd2808534e239e30001fe98 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -56,16 +56,38 @@ def DrawMachine(machineSize):
        glVertex3f(machineSize.x, machineSize.y, 0)\r
        glVertex3f(0, machineSize.y, 0)\r
        glEnd()\r
-       glColor3f(0.7,0.7,0.7)\r
-       glLineWidth(2)\r
-       glBegin(GL_LINES)\r
-       for i in xrange(0, int(machineSize.x), 10):\r
-               glVertex3f(i, 0, 0)\r
-               glVertex3f(i, machineSize.y, 0)\r
-       for i in xrange(0, int(machineSize.y), 10):\r
-               glVertex3f(0, i, 0)\r
-               glVertex3f(machineSize.x, i, 0)\r
-       glEnd()\r
+       if False:\r
+               glColor3f(0.7,0.7,0.7)\r
+               glLineWidth(2)\r
+               glBegin(GL_LINES)\r
+               for i in xrange(0, int(machineSize.x), 10):\r
+                       glVertex3f(i, 0, 0)\r
+                       glVertex3f(i, machineSize.y, 0)\r
+               for i in xrange(0, int(machineSize.y), 10):\r
+                       glVertex3f(0, i, 0)\r
+                       glVertex3f(machineSize.x, i, 0)\r
+               glEnd()\r
+       else:\r
+               glColor4f(0.7,0.7,0.7,0.7)\r
+               glDisable(GL_CULL_FACE)\r
+               glEnable(GL_BLEND)\r
+               glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)\r
+               glBegin(GL_QUADS)\r
+               for x in xrange(0, int(machineSize.x), 20):\r
+                       for y in xrange(0, int(machineSize.y), 20):\r
+                               glVertex3f(x, y, -0.01)\r
+                               glVertex3f(min(x+10, machineSize.x), y, -0.01)\r
+                               glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)\r
+                               glVertex3f(x, min(y+10, machineSize.y), -0.01)\r
+               for x in xrange(10, int(machineSize.x), 20):\r
+                       for y in xrange(10, int(machineSize.y), 20):\r
+                               glVertex3f(x, y, -0.01)\r
+                               glVertex3f(min(x+10, machineSize.x), y, -0.01)\r
+                               glVertex3f(min(x+10, machineSize.x), min(y+10, machineSize.y), -0.01)\r
+                               glVertex3f(x, min(y+10, machineSize.y), -0.01)\r
+               glEnd()\r
+               glEnable(GL_CULL_FACE)\r
+               glDisable(GL_BLEND)\r
        glLineWidth(1)\r
        glBegin(GL_LINE_LOOP)\r
        glVertex3f(0, 0, machineSize.z)\r

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index 2d53566ec5a56403844e59afe03d1a70b74a7c18..d32992c98cd7af852110aaaa8a8c1351904a6c32 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -486,7 +486,6 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 \r
        def OnDraw(self):\r
                machineSize = self.parent.machineSize\r
-               opengl.DrawMachine(machineSize)\r
 \r
                if self.parent.gcode != None and self.parent.gcodeDirty:\r
                        if self.gcodeDisplayListCount < len(self.parent.gcode.layerList) or self.gcodeDisplayList == None:\r
@@ -633,6 +632,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                        glEnd()\r
                        glEnable(GL_DEPTH_TEST)\r
                glFlush()\r
+               opengl.DrawMachine(machineSize)\r
        \r
        def drawModel(self, obj):\r
                multiX = 1 #int(profile.getProfileSetting('model_multiply_x'))\r

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 0f71ec889cbbf3e4676c7d0b9a85cd2645688865..29d477934d02f15357c0571ab493c85033a2727a 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -779,7 +779,6 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
 \r
        def OnDraw(self):\r
                machineSize = self.parent.machineSize\r
-               opengl.DrawMachine(util3d.Vector3(machineSize[0], machineSize[1], machineSize[2]))\r
                extraSizeMin, extraSizeMax = self.parent.getExtraHeadSize()\r
 \r
                for item in self.parent.list:\r
@@ -868,6 +867,7 @@ class PreviewGLCanvas(glcanvas.GLCanvas):
                        \r
                        glPopMatrix()\r
                \r
+               opengl.DrawMachine(util3d.Vector3(machineSize[0], machineSize[1], machineSize[2]))\r
                glFlush()\r
 \r
 class ProjectSliceProgressWindow(wx.Frame):\r