dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Merge branch 'debugGtk' into wx3

Browse Source
This commit is contained in:
blitzmann
2015-06-27 18:25:31 -04:00
parent a4fe3fe142 5b0857e169
commit 030f22b66f
3 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/chromeTabs.py
View File

@@ -21,7 +21,6 @@ import wx
import wx.lib.newevent
import gui.utils.colorUtils as colorUtils
import gui.utils.drawUtils as drawUtils
import gui.utils.fonts as fonts
from gui import bitmapLoader
import gui.utils.fonts as fonts
@@ -278,7 +277,7 @@ class PFNotebook(wx.Panel):
bx, by = self.GetBorders()
ww -= bx * 4
wh -= by * 4
self.activePage.SetSize((ww, wh))
self.activePage.SetSize((max(ww, -1), max(wh, -1)))
self.activePage.SetPosition((0, 0))
if not resizeOnly:

71
gui/pygauge.py
View File

@@ -312,47 +312,53 @@ class PyGauge(wx.PyWindow):
r = copy.copy(rect)
r.width = w
if r.width > 0:
# If we draw it with zero width, GTK throws errors. This way,
# only draw it if the gauge will actually show something.
# We stick other calculations in this block to avoid wasting
# time on them if not needed. See GH issue #282
pv = value
xv=1
transition = 0
if pv <= 100:
xv = pv/100
pv = value
xv=1
transition = 0
elif pv <=101:
xv = pv -100
transition = 1
if pv <= 100:
xv = pv/100
transition = 0
elif pv <= 103:
xv = (pv -101)/2
transition = 2
elif pv <=101:
xv = pv -100
transition = 1
elif pv <= 105:
xv = (pv -103)/2
transition = 3
elif pv <= 103:
xv = (pv -101)/2
transition = 2
else:
pv = 106
xv = pv -100
transition = -1
elif pv <= 105:
xv = (pv -103)/2
transition = 3
if transition != -1:
colorS,colorE = self.transitionsColors[transition]
color = colorUtils.CalculateTransitionColor(colorS, colorE, xv)
else:
color = wx.Colour(191,48,48)
else:
pv = 106
xv = pv -100
transition = -1
if self.gradientEffect > 0:
gcolor = colorUtils.BrightenColor(color, float(self.gradientEffect) / 100)
gMid = colorUtils.BrightenColor(color, float(self.gradientEffect/2) / 100)
else:
gcolor = colorUtils.DarkenColor(color, float(-self.gradientEffect) / 100)
gMid = colorUtils.DarkenColor(color, float(-self.gradientEffect/2) / 100)
if transition != -1:
colorS,colorE = self.transitionsColors[transition]
color = colorUtils.CalculateTransitionColor(colorS, colorE, xv)
else:
color = wx.Colour(191,48,48)
if self.gradientEffect > 0:
gcolor = colorUtils.BrightenColor(color, float(self.gradientEffect) / 100)
gMid = colorUtils.BrightenColor(color, float(self.gradientEffect/2) / 100)
else:
gcolor = colorUtils.DarkenColor(color, float(-self.gradientEffect) / 100)
gMid = colorUtils.DarkenColor(color, float(-self.gradientEffect/2) / 100)
gBmp = drawUtils.DrawGradientBar(r.width, r.height, gMid, color, gcolor)
dc.DrawBitmap(gBmp, r.left, r.top)
gBmp = drawUtils.DrawGradientBar(r.width, r.height, gMid, color, gcolor)
dc.DrawBitmap(gBmp,r.left, r.top)
else:
colour=self.GetBarColour()
dc.SetBrush(wx.Brush(colour))
@@ -397,7 +403,6 @@ class PyGauge(wx.PyWindow):
dc.SetTextForeground(wx.Colour(255,255,255))
dc.DrawLabel(formatStr.format(value), rect, wx.ALIGN_CENTER)
def OnTimer(self,event):
"""
Handles the ``wx.EVT_TIMER`` event for L{PyfaGauge}.

3
gui/utils/drawUtils.py
View File

@@ -33,9 +33,10 @@ def DrawFilledBitmap(width, height, color):
return canvas
def DrawGradientBar(width, height, gStart, gEnd, gMid = None, fillRatio = 4):
# we need to have dimensions to draw
assert width > 0 and height > 0
canvas = wx.EmptyBitmap(width,height)
mdc = wx.MemoryDC()
mdc.SelectObject(canvas)