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

so many pep8 fixes

Browse Source 
(cherry picked from commit bee125d)
This commit is contained in:
a-tal
2016-12-03 17:04:12 -08:00
committed by Ebag333
parent 510492e5e9
commit d3b6bc1c93
133 changed files with 3371 additions and 3319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
gui/utils/colorUtils.py
View File

@@ -1,25 +1,26 @@
import wx
import math
#Brightens a color (wx.Colour), factor = [0,1]
def BrightenColor(color, factor):
# Brightens a color (wx.Colour), factor = [0,1]
r,g,b = color
r, g, b = color
a = color.Alpha()
factor = min(max(factor, 0), 1)
r+=(255-r)*factor
b+=(255-b)*factor
g+=(255-g)*factor
r += (255 - r) * factor
b += (255 - b) * factor
g += (255 - g) * factor
return wx.Colour(r,g,b,a)
return wx.Colour(r, g, b, a)
#Darkens a color (wx.Colour), factor = [0, 1]
def DarkenColor(color, factor):
bkR ,bkG , bkB = color
# Darkens a color (wx.Colour), factor = [0, 1]
bkR, bkG, bkB = color
alpha = color.Alpha()
@@ -30,50 +31,50 @@ def DarkenColor(color, factor):
g = float(bkG * factor)
b = float(bkB * factor)
r = min(max(r,0),255)
b = min(max(b,0),255)
g = min(max(g,0),255)
r = min(max(r, 0), 255)
b = min(max(b, 0), 255)
g = min(max(g, 0), 255)
return wx.Colour(r, g, b, alpha)
#Calculates the brightness of a color, different options
def GetBrightnessO1(color):
r,g,b = color
return (0.299*r + 0.587*g + 0.114*b)
# Calculates the brightness of a color, different options
r, g, b = color
return (0.299 * r + 0.587 * g + 0.114 * b)
def GetBrightnessO2(color):
r,g,b = color
return math.sqrt( 0.241 * r * r + 0.691 * g * g + 0.068 * b * b )
r, g, b = color
return math.sqrt(0.241 * r * r + 0.691 * g * g + 0.068 * b * b)
#Calculates a suitable color based on original color (wx.Colour), its brightness, a factor=[0,1] (darken/brighten by factor depending on calculated brightness)
def GetSuitableColor(color, factor):
# Calculates a suitable color based on original color (wx.Colour), its brightness, a factor=[0,1] (darken/brighten by factor depending on calculated brightness)
brightness = GetBrightnessO1(color)
if brightness >129:
if brightness > 129:
return DarkenColor(color, factor)
else:
return BrightenColor(color, factor)
#Calculates the color between a given start and end colors, delta = [0,1]
#Colors are wx.Colour objects
def CalculateTransitionColor(startColor, endColor, delta):
sR,sG,sB = startColor
eR,eG,eB = endColor
"""
Calculates the color between a given start and end colors, delta = [0,1]
Colors are wx.Colour objects
"""
sR, sG, sB = startColor
eR, eG, eB = endColor
alphaS = startColor.Alpha()
alphaE = endColor.Alpha()
tR = sR + (eR - sR) * delta
tG = sG + (eG - sG) * delta
tB = sB + (eB - sB) * delta
tR = sR + (eR - sR) * delta
tG = sG + (eG - sG) * delta
tB = sB + (eB - sB) * delta
return wx.Colour(tR, tG, tB, (alphaS + alphaE)/2)
return wx.Colour(tR, tG, tB, (alphaS + alphaE) / 2)