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

#2180: allow user to enable/disable rounded corners; merge from gramps30

Browse Source 
svn: r10772
This commit is contained in:
Stéphane Charette 2008-05-31 08:42:38 +00:00
parent e57e3fa7c7
commit 68243e76b5
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/GVRelGraph.py
View File

@ -8,6 +8,7 @@
# Copyright (C) 2005-2006 Eero Tamminen # Copyright (C) 2005-2006 Eero Tamminen
# Copyright (C) 2007 Johan Gonqvist <johan.gronqvist@gmail.com> # Copyright (C) 2007 Johan Gonqvist <johan.gronqvist@gmail.com>
# Contributions by Lorenzo Cappelletti <lorenzo.cappelletti@email.it> # Contributions by Lorenzo Cappelletti <lorenzo.cappelletti@email.it>
# Copyright (C) 2008 Stephane Charette <stephanecharette@gmail.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -100,9 +101,14 @@ class RelGraphReport(Report):
imgpos - Image position, above/beside name imgpos - Image position, above/beside name
color - Whether to use outline, colored outline or filled color in graph color - Whether to use outline, colored outline or filled color in graph
dashed - Whether to use dashed lines for non-birth relationships. dashed - Whether to use dashed lines for non-birth relationships.
use_roundedcorners - Whether to use rounded corners for females
""" """
Report.__init__(self, database, options_class) Report.__init__(self, database, options_class)
# Would be nice to get rid of these 2 hard-coded arrays of colours
# and instead allow the user to pick-and-choose whatever colour they
# want. When/if this is done, take a look at the colour-selection
# widget and code used in the FamilyLines graph.
colored = { colored = {
'male': 'dodgerblue4', 'male': 'dodgerblue4',
'female': 'deeppink', 'female': 'deeppink',
@ -123,6 +129,7 @@ class RelGraphReport(Report):
self.includeurl = menu.get_option_by_name('url').get_value() self.includeurl = menu.get_option_by_name('url').get_value()
self.includeimg = menu.get_option_by_name('includeImages').get_value() self.includeimg = menu.get_option_by_name('includeImages').get_value()
self.imgpos = menu.get_option_by_name('imageOnTheSide').get_value() self.imgpos = menu.get_option_by_name('imageOnTheSide').get_value()
self.use_roundedcorners = menu.get_option_by_name('useroundedcorners').get_value()
self.adoptionsdashed = menu.get_option_by_name('dashed').get_value() self.adoptionsdashed = menu.get_option_by_name('dashed').get_value()
self.show_families = menu.get_option_by_name('showfamily').get_value() self.show_families = menu.get_option_by_name('showfamily').get_value()
self.just_years = menu.get_option_by_name('justyears').get_value() self.just_years = menu.get_option_by_name('justyears').get_value()
@ -262,18 +269,15 @@ class RelGraphReport(Report):
"return gender specific person style" "return gender specific person style"
gender = person.get_gender() gender = person.get_gender()
shape = "box" shape = "box"
style = "" style = "solid"
color = "" color = ""
fill = "" fill = ""
if gender == person.MALE:
shape = "box" if gender == person.FEMALE and self.use_roundedcorners:
style = "solid" style="rounded"
elif gender == person.FEMALE: elif gender == person.UNKNOWN:
shape = "box" shape="hexagon"
style = "rounded"
else:
shape = "hexagon"
style = "solid"
if self.colorize == 'colored': if self.colorize == 'colored':
if gender == person.MALE: if gender == person.MALE:
color = self.colors['male'] color = self.colors['male']
@ -282,10 +286,7 @@ class RelGraphReport(Report):
else: else:
color = self.colors['unknown'] color = self.colors['unknown']
elif self.colorize == 'filled': elif self.colorize == 'filled':
if style != "": style += ",filled"
style += ",filled"
else:
style = "filled"
if gender == person.MALE: if gender == person.MALE:
fill = self.colors['male'] fill = self.colors['male']
elif gender == person.FEMALE: elif gender == person.FEMALE:
@ -506,6 +507,13 @@ class RelGraphOptions(MenuReportOptions):
arrow.set_help(_("Choose the direction that the arrows point.")) arrow.set_help(_("Choose the direction that the arrows point."))
menu.add_option(category_name, "arrow", arrow) menu.add_option(category_name, "arrow", arrow)
roundedcorners = BooleanOption( # see bug report #2180
_("Use rounded corners"), False)
roundedcorners.set_help(
_("Use rounded corners to differentiate "
"between women and men."))
menu.add_option(category_name, "useroundedcorners", roundedcorners)
dashed = BooleanOption( dashed = BooleanOption(
_("Indicate non-birth relationships with dotted lines"), True) _("Indicate non-birth relationships with dotted lines"), True)
dashed.set_help(_("Non-birth relationships will show up " dashed.set_help(_("Non-birth relationships will show up "