From: daid303 Date: Thu, 7 Mar 2013 09:18:20 +0000 (+0100) Subject: Add black borders around the white text, so it pops out more. X-Git-Tag: 13.03~19 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1d3ea15b601846c0c523e7f6dc1fccc0d82f10ab;p=cura.git 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 309e7f59..0af0d693 100644 --- 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 ab274280..797787c6 100644 --- 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 25ae4225..4700216e 100644 --- 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 2acc84ac..51db5c73 100644 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 901595c7..c9a2b3ea 100644 --- 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))