Changed the 3D preview to have colors that are easier on the eyes.

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 37b707b2785a2c4cda9df4c241967861f5bad8b8..ca0d198b298c8046874c668f1f2e62f15e38cae8 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -505,8 +505,8 @@ class configWizard(wx.wizard.Wizard):
                wx.wizard.WizardPageSimple.Chain(self.firstInfoPage, self.machineSelectPage)\r
                wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimakerFirmwareUpgradePage)\r
                wx.wizard.WizardPageSimple.Chain(self.ultimakerFirmwareUpgradePage, self.ultimakerCheckupPage)\r
-               wx.wizard.WizardPageSimple.Chain(self.ultimakerCheckupPage, self.ultimakerCalibrationPage)\r
-               wx.wizard.WizardPageSimple.Chain(self.ultimakerCalibrationPage, self.ultimakerCalibrateStepsPerEPage)\r
+               #wx.wizard.WizardPageSimple.Chain(self.ultimakerCheckupPage, self.ultimakerCalibrationPage)\r
+               #wx.wizard.WizardPageSimple.Chain(self.ultimakerCalibrationPage, self.ultimakerCalibrateStepsPerEPage)\r
                \r
                self.FitToPage(self.firstInfoPage)\r
                self.GetPageAreaSizer().Add(self.firstInfoPage)\r

diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index 8a5deae32c0822933bd2808534e239e30001fe98..b6802975277cdf6d2bb1232752e96cba0f4fed73 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -30,7 +30,7 @@ def InitGL(window, view3D, zoom):
        glEnable(GL_CULL_FACE)\r
        glDisable(GL_BLEND)\r
 \r
-       glClearColor(0.0, 0.0, 0.0, 1.0)\r
+       glClearColor(1.0, 1.0, 1.0, 1.0)\r
        glClearStencil(0)\r
        glClearDepth(1.0)\r
 \r
@@ -47,15 +47,6 @@ def InitGL(window, view3D, zoom):
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT)\r
 \r
 def DrawMachine(machineSize):\r
-       glColor3f(1.0,1.0,1.0)\r
-       glLineWidth(4)\r
-       glDisable(GL_LIGHTING)\r
-       glBegin(GL_LINE_LOOP)\r
-       glVertex3f(0, 0, 0)\r
-       glVertex3f(machineSize.x, 0, 0)\r
-       glVertex3f(machineSize.x, machineSize.y, 0)\r
-       glVertex3f(0, machineSize.y, 0)\r
-       glEnd()\r
        if False:\r
                glColor3f(0.7,0.7,0.7)\r
                glLineWidth(2)\r
@@ -68,10 +59,10 @@ def DrawMachine(machineSize):
                        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
+               glColor4ub(5,171,231,127)\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
@@ -86,9 +77,40 @@ def DrawMachine(machineSize):
                                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
+               glColor4ub(5,171,231,64)\r
+               glBegin(GL_QUADS)\r
+               for x in xrange(10, 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(0, 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
+       \r
+       glEnable(GL_LINE_SMOOTH)\r
+       glEnable(GL_BLEND)\r
+       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)\r
+       glHint(GL_LINE_SMOOTH_HINT, GL_DONT_CARE);\r
+\r
+       glColor3f(0.0,0.0,0.0)\r
+       glLineWidth(4)\r
+       glDisable(GL_LIGHTING)\r
+       glBegin(GL_LINE_LOOP)\r
+       glVertex3f(0, 0, 0)\r
+       glVertex3f(machineSize.x, 0, 0)\r
+       glVertex3f(machineSize.x, machineSize.y, 0)\r
+       glVertex3f(0, machineSize.y, 0)\r
+       glEnd()\r
+       \r
+       glLineWidth(2)\r
        glBegin(GL_LINE_LOOP)\r
        glVertex3f(0, 0, machineSize.z)\r
        glVertex3f(machineSize.x, 0, machineSize.z)\r