Add black borders around the white text, so it pops out more.

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 309e7f593290279e88c06ec0a1897a4366dbe885..0af0d6931892b4e30d2a9e01417a4458b9f399c9 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -519,7 +519,9 @@ class mainWindow(wx.Frame):
                        if not isSimple:
                                self.normalSashPos = self.splitter.GetSashPosition()
                        profile.putPreference('window_normal_sash', self.normalSashPos)
-                       
+
+               #HACK: Set the paint function of the glCanvas to nothing so it won't keep refreshing. Which keeps wxWidgets from quiting.
+               self.preview3d.glCanvas.OnPaint = lambda e : e
                self.Destroy()
 
        def OnQuit(self, e):

diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py
index ab2742803ef69bcd33c3868885e1b59207c5532a..797787c62f5fc1127f2d1455045711ae15792941 100644 (file)
--- a/Cura/gui/preview3d.py
+++ b/Cura/gui/preview3d.py
@@ -94,17 +94,17 @@ class previewPanel(wx.Panel):
                self.mirrorYButton       = openglGui.glButton(self.glCanvas, 18, 'Mirror Y', (2,-3), lambda : self.OnMirror(1))
                self.mirrorZButton       = openglGui.glButton(self.glCanvas, 22, 'Mirror Z', (2,-4), lambda : self.OnMirror(2))
 
-               self.openFileButton      = openglGui.glButton(self.glCanvas, 4, 'Load model', (0,0), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(1))
-               self.sliceButton         = openglGui.glButton(self.glCanvas, 5, 'Prepare model', (1,0), lambda : self.GetParent().GetParent().GetParent().OnSlice(None))
-               self.printButton         = openglGui.glButton(self.glCanvas, 6, 'Print model', (2,0), lambda : self.GetParent().GetParent().GetParent().OnPrint(None))
+               self.openFileButton      = openglGui.glButton(self.glCanvas, 4, 'Load', (0,0), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(1))
+               self.sliceButton         = openglGui.glButton(self.glCanvas, 5, 'Prepare', (1,0), lambda : self.GetParent().GetParent().GetParent().OnSlice(None))
+               self.printButton         = openglGui.glButton(self.glCanvas, 6, 'Print', (2,0), lambda : self.GetParent().GetParent().GetParent().OnPrint(None))
 
                extruderCount = int(profile.getPreference('extruder_amount'))
                if extruderCount > 1:
-                       openglGui.glButton(self.glCanvas, 4, 'Load dual model', (0,1), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(2))
+                       openglGui.glButton(self.glCanvas, 4, 'Load dual', (0,1), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(2))
                if extruderCount > 2:
-                       openglGui.glButton(self.glCanvas, 4, 'Load triple model', (0,2), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(3))
+                       openglGui.glButton(self.glCanvas, 4, 'Load triple', (0,2), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(3))
                if extruderCount > 3:
-                       openglGui.glButton(self.glCanvas, 4, 'Load quad model', (0,3), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(4))
+                       openglGui.glButton(self.glCanvas, 4, 'Load quad', (0,3), lambda : self.GetParent().GetParent().GetParent()._showModelLoadDialog(4))
 
                self.scaleForm = openglGui.glFrame(self.glCanvas, (2, -2))
                openglGui.glGuiLayoutGrid(self.scaleForm)
@@ -123,7 +123,7 @@ class previewPanel(wx.Panel):
                openglGui.glLabel(self.scaleForm, 'Uniform scale', (0,8))
                self.scaleUniform = openglGui.glCheckbox(self.scaleForm, True, (1,8), None)
 
-               self.viewSelection = openglGui.glComboButton(self.glCanvas, 'View mode', [7,11,15,19,23], ['3D Model', 'Transparent', 'X-Ray', 'Overhang', 'Layers'], (-1,0), self.OnViewChange)
+               self.viewSelection = openglGui.glComboButton(self.glCanvas, 'View mode', [7,11,15,19,23], ['Normal', 'Transparent', 'X-Ray', 'Overhang', 'Layers'], (-1,0), self.OnViewChange)
                self.layerSelect = openglGui.glSlider(self.glCanvas, 0, 0, 100, (-1,-2), self.OnLayerNrChange)
 
                self.OnViewChange()
@@ -640,7 +640,7 @@ class PreviewGLCanvas(openglGui.glGuiPanel):
                        glRotate(self.yaw, 0,0,1)
 
                        if self.viewMode == "GCode" or self.viewMode == "Mixed":
-                               n = self.parent.layerSelect.getValue()
+                               n = min(self.gcodeQuickDisplayListMade, self.parent.layerSelect.getValue())
                                if self.parent.gcode is not None and -1 < n < len(self.parent.gcode.layerList) and len(self.parent.gcode.layerList[n]) > 0:
                                        self.viewTarget[2] = self.parent.gcode.layerList[n][0].list[-1].z
                        else:

diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 25ae42253a6fd0afec53f00c7644a6f919ede4a1..4700216e2d52d655a88f4f099a3c1cba35a2db0d 100644 (file)
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -367,13 +367,27 @@ class glButton(glGuiControl):
                        glColor4ub(128,128,128,128)
                else:
                        glColor4ub(255,255,255,255)
+               opengl.glDrawTexturedQuad(pos[0]-bs*scale/2, pos[1]-bs*scale/2, bs*scale, bs*scale, 0)
                opengl.glDrawTexturedQuad(pos[0]-bs*scale/2, pos[1]-bs*scale/2, bs*scale, bs*scale, self._imageID)
                glPushMatrix()
                glTranslatef(pos[0], pos[1], 0)
                glDisable(GL_TEXTURE_2D)
                if self._focus:
-                       glColor4ub(255,255,255,255)
                        glTranslatef(0, -0.55*bs*scale, 0)
+
+                       glPushMatrix()
+                       glColor4ub(60,60,60,255)
+                       glTranslatef(-1, -1, 0)
+                       opengl.glDrawStringCenter(self._tooltip)
+                       glTranslatef(0, 2, 0)
+                       opengl.glDrawStringCenter(self._tooltip)
+                       glTranslatef(2, 0, 0)
+                       opengl.glDrawStringCenter(self._tooltip)
+                       glTranslatef(0, -2, 0)
+                       opengl.glDrawStringCenter(self._tooltip)
+                       glPopMatrix()
+
+                       glColor4ub(255,255,255,255)
                        opengl.glDrawStringCenter(self._tooltip)
                glPopMatrix()
 
@@ -447,16 +461,29 @@ class glComboButton(glButton):
                glPushMatrix()
                glTranslatef(pos[0]+bs*0.5, pos[1] + bs*0.5, 0)
                glBindTexture(GL_TEXTURE_2D, self._base._glButtonsTexture)
-               glScalef(bs, bs, bs)
                for n in xrange(0, len(self._imageIDs)):
-                       glTranslatef(0, 1, 0)
+                       glTranslatef(0, bs, 0)
                        glColor4ub(255,255,255,255)
-                       opengl.glDrawTexturedQuad(-0.5,-0.5,1,1, self._imageIDs[n])
+                       opengl.glDrawTexturedQuad(-0.5*bs,-0.5*bs,bs,bs, 0)
+                       opengl.glDrawTexturedQuad(-0.5*bs,-0.5*bs,bs,bs, self._imageIDs[n])
                        glDisable(GL_TEXTURE_2D)
 
                        glPushMatrix()
+                       glTranslatef(-0.55*bs, 0.1*bs, 0)
+
+                       glPushMatrix()
+                       glColor4ub(60,60,60,255)
+                       glTranslatef(-1, -1, 0)
+                       opengl.glDrawStringRight(self._tooltips[n])
+                       glTranslatef(0, 2, 0)
+                       opengl.glDrawStringRight(self._tooltips[n])
+                       glTranslatef(2, 0, 0)
+                       opengl.glDrawStringRight(self._tooltips[n])
+                       glTranslatef(0, -2, 0)
+                       opengl.glDrawStringRight(self._tooltips[n])
+                       glPopMatrix()
+
                        glColor4ub(255,255,255,255)
-                       glTranslatef(-0.55, 0.1, 0)
                        opengl.glDrawStringRight(self._tooltips[n])
                        glPopMatrix()
                glPopMatrix()

diff --git a/Cura/resources/images/glButtons.png b/Cura/resources/images/glButtons.png
index 2acc84acd6c3bd0f9ea743202672870ea3d8a322..51db5c73ed36b5feaa2a07d9e7c15308ce8328de 100644 (file)
Binary files a/Cura/resources/images/glButtons.png and b/Cura/resources/images/glButtons.png differ

diff --git a/Cura/util/gcodeInterpreter.py b/Cura/util/gcodeInterpreter.py
index 901595c74f657acef0e06d702e3d4e82a4a23a0a..c9a2b3eacebb357a157912a4b2cc7ce8865fbf28 100644 (file)
--- a/Cura/util/gcodeInterpreter.py
+++ b/Cura/util/gcodeInterpreter.py
@@ -261,7 +261,7 @@ class gcode(object):
                                        else:
                                                print "Unknown M code:" + str(M)
                self.layerList.append(currentLayer)
-               if self.progressCallback is not None:
+               if self.progressCallback is not None and self._fileSize > 0:
                        self.progressCallback(float(gcodeFile.tell()) / float(self._fileSize))
                self.extrusionAmount = maxExtrusion
                self.totalMoveTimeMinute = totalMoveTimeMinute
@@ -272,7 +272,7 @@ class gcode(object):
                if code not in self.regMatch:
                        self.regMatch[code] = re.compile(code + '([^\s]+)')
                m = self.regMatch[code].search(line)
-               if m == None:
+               if m is None:
                        return None
                try:
                        return int(m.group(1))