Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tag colors on PedigreeView (#915)

Browse Source 
Fixes #11363

* Handle long and short hex format black color

* Fix hex_to_rgb_float utility function
This commit is contained in:
romjerome 2019-10-17 01:57:36 +02:00 committed by Sam Manzi
parent c54f381737
commit 75b0b66269
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/gui/utils.py
View File

@ -551,16 +551,17 @@ def color_graph_box(alive=False, gender=Person.MALE):
def hex_to_rgb_float(value): def hex_to_rgb_float(value):
""" """
Convert a hexademical value #FF00FF to rgb. Returns tuple of float between Convert a 6 or 12 digit hexademical value to rgb. Returns tuple of floats
0 and 1 between 0 and 1.
""" """
value = value.lstrip('#') value = value.lstrip('#')
lenv = len(value) lenv = len(value)
return tuple(int(value[i:i+lenv//3], 16)/256.0 for i in range(0, lenv, lenv//3)) return tuple(int(value[i:i+lenv//3], 16)/16.0**(lenv//3)
for i in range(0, lenv, lenv//3))
def hex_to_rgb(value): def hex_to_rgb(value):
""" """
Convert a hexadecimal value #FF00FF to rgb. Returns tuple of integers Convert a 6 or 12 digit hexadecimal value to rgb. Returns tuple of integers.
""" """
value = value.lstrip('#') value = value.lstrip('#')
lenv = len(value) lenv = len(value)

6
gramps/plugins/view/pedigreeview.py
View File

@ -196,10 +196,10 @@ class PersonBoxWidgetCairo(_PersonWidgetBase):
if tags and person: if tags and person:
for tag_handle in person.get_tag_list(): for tag_handle in person.get_tag_list():
# For the complete tag, don't modify the default color # For the complete tag, don't modify the default color
# which is black (#000000000000) # which is black
tag = dbstate.db.get_tag_from_handle(tag_handle) tag = dbstate.db.get_tag_from_handle(tag_handle)
if tag.get_color() != "#000000000000": # only if the color if tag.get_color() not in ("#000000", "#000000000000"):
self.bgcolor = tag.get_color() # is not black self.bgcolor = tag.get_color()
self.bgcolor = hex_to_rgb_float(self.bgcolor) self.bgcolor = hex_to_rgb_float(self.bgcolor)
self.bordercolor = hex_to_rgb_float(self.bordercolor) self.bordercolor = hex_to_rgb_float(self.bordercolor)