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

Simplify using partials and lambdas

Browse Source 
svn: r16704
This commit is contained in:
Gerald Britton 2011-02-23 18:23:56 +00:00
parent 8579483616
commit 3ff2a2ef91
2 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/drawreport/StatisticsChart.py
View File

@ -33,6 +33,7 @@
#------------------------------------------------------------------------ #------------------------------------------------------------------------
import time import time
from gen.ggettext import sgettext as _ from gen.ggettext import sgettext as _
from functools import partial
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -701,14 +702,16 @@ class StatisticsChart(Report):
""" """
Report.__init__(self, database, options_class) Report.__init__(self, database, options_class)
menu = options_class.menu menu = options_class.menu
get_option_by_name = menu.get_option_by_name
get_value = lambda name: get_option_by_name(name).get_value()
self.filter_option = menu.get_option_by_name('filter') self.filter_option = get_option_by_name('filter')
self.filter = self.filter_option.get_filter() self.filter = self.filter_option.get_filter()
self.bar_items = menu.get_option_by_name('bar_items').get_value() self.bar_items = get_value('bar_items')
year_from = menu.get_option_by_name('year_from').get_value() year_from = get_value('year_from')
year_to = menu.get_option_by_name('year_to').get_value() year_to = get_value('year_to')
gender = menu.get_option_by_name('gender').get_value() gender = get_value('gender')
# title needs both data extraction method name + gender name # title needs both data extraction method name + gender name
if gender == Person.MALE: if gender == Person.MALE:
@ -730,13 +733,13 @@ class StatisticsChart(Report):
self.progress.set_pass(_('Collecting data...'), 1) self.progress.set_pass(_('Collecting data...'), 1)
tables = _Extract.collect_data(database, self.filter, menu, tables = _Extract.collect_data(database, self.filter, menu,
gender, year_from, year_to, gender, year_from, year_to,
menu.get_option_by_name('no_years').get_value()) get_value('no_years'))
self.progress.step() self.progress.step()
self.progress.set_pass(_('Sorting data...'), len(tables)) self.progress.set_pass(_('Sorting data...'), len(tables))
self.data = [] self.data = []
sortby = menu.get_option_by_name('sortby').get_value() sortby = get_value('sortby')
reverse = menu.get_option_by_name('reverse').get_value() reverse = get_value('reverse')
for table in tables: for table in tables:
# generate sorted item lookup index index # generate sorted item lookup index index
lookup = self.index_items(table[1], sortby, reverse) lookup = self.index_items(table[1], sortby, reverse)
@ -896,17 +899,20 @@ class StatisticsChartOptions(MenuReportOptions):
""" """
Add options to the menu for the statistics report. Add options to the menu for the statistics report.
""" """
category_name = _("Report Options")
################################
add_option = partial(menu.add_option, _("Report Options"))
################################
self.__filter = FilterOption(_("Filter"), 0) self.__filter = FilterOption(_("Filter"), 0)
self.__filter.set_help( self.__filter.set_help(
_("Determines what people are included in the report.")) _("Determines what people are included in the report."))
menu.add_option(category_name, "filter", self.__filter) add_option("filter", self.__filter)
self.__filter.connect('value-changed', self.__filter_changed) self.__filter.connect('value-changed', self.__filter_changed)
self.__pid = PersonOption(_("Filter Person")) self.__pid = PersonOption(_("Filter Person"))
self.__pid.set_help(_("The center person for the filter.")) self.__pid.set_help(_("The center person for the filter."))
menu.add_option(category_name, "pid", self.__pid) add_option("pid", self.__pid)
self.__pid.connect('value-changed', self.__update_filters) self.__pid.connect('value-changed', self.__update_filters)
self.__update_filters() self.__update_filters()
@ -917,28 +923,28 @@ class StatisticsChartOptions(MenuReportOptions):
item = _options.sorts[item_idx] item = _options.sorts[item_idx]
sortby.add_item(item_idx,item[2]) sortby.add_item(item_idx,item[2])
sortby.set_help( _("Select how the statistical data is sorted.")) sortby.set_help( _("Select how the statistical data is sorted."))
menu.add_option(category_name,"sortby",sortby) add_option("sortby",sortby)
reverse = BooleanOption(_("Sort in reverse order"), False) reverse = BooleanOption(_("Sort in reverse order"), False)
reverse.set_help(_("Check to reverse the sorting order.")) reverse.set_help(_("Check to reverse the sorting order."))
menu.add_option(category_name,"reverse", reverse) add_option("reverse", reverse)
this_year = time.localtime()[0] this_year = time.localtime()[0]
year_from = NumberOption(_("People Born After"), year_from = NumberOption(_("People Born After"),
1700, 1, this_year) 1700, 1, this_year)
year_from.set_help(_("Birth year from which to include people.")) year_from.set_help(_("Birth year from which to include people."))
menu.add_option(category_name,"year_from", year_from) add_option("year_from", year_from)
year_to = NumberOption(_("People Born Before"), year_to = NumberOption(_("People Born Before"),
this_year, 1, this_year) this_year, 1, this_year)
year_to.set_help(_("Birth year until which to include people")) year_to.set_help(_("Birth year until which to include people"))
menu.add_option(category_name,"year_to", year_to) add_option("year_to", year_to)
no_years = BooleanOption(_("Include people without known birth years"), no_years = BooleanOption(_("Include people without known birth years"),
False) False)
no_years.set_help(_("Whether to include people without " no_years.set_help(_("Whether to include people without "
"known birth years.")) "known birth years."))
menu.add_option(category_name,"no_years", no_years) add_option("no_years", no_years)
gender = EnumeratedListOption(_('Genders included'), gender = EnumeratedListOption(_('Genders included'),
Person.UNKNOWN ) Person.UNKNOWN )
@ -947,12 +953,12 @@ class StatisticsChartOptions(MenuReportOptions):
gender.add_item(item[0],item[2]) gender.add_item(item[0],item[2])
gender.set_help( _("Select which genders are included into " gender.set_help( _("Select which genders are included into "
"statistics.")) "statistics."))
menu.add_option(category_name,"gender",gender) add_option("gender",gender)
bar_items = NumberOption(_("Max. items for a pie"), 8, 0, 20) bar_items = NumberOption(_("Max. items for a pie"), 8, 0, 20)
bar_items.set_help(_("With fewer items pie chart and legend will be " bar_items.set_help(_("With fewer items pie chart and legend will be "
"used instead of a bar chart.")) "used instead of a bar chart."))
menu.add_option(category_name,"bar_items", bar_items) add_option("bar_items", bar_items)
# ------------------------------------------------- # -------------------------------------------------
# List of available charts on separate option tabs # List of available charts on separate option tabs
@ -967,7 +973,7 @@ class StatisticsChartOptions(MenuReportOptions):
opt = BooleanOption(_Extract.extractors[key][1], False) opt = BooleanOption(_Extract.extractors[key][1], False)
opt.set_help(_("Include charts with indicated data.")) opt.set_help(_("Include charts with indicated data."))
menu.add_option(category_name,key, opt) add_option(key, opt)
idx += 1 idx += 1
# Enable a couple of charts by default # Enable a couple of charts by default

81
src/plugins/graph/GVRelGraph.py
View File

@ -40,6 +40,7 @@ Create a relationship graph using Graphviz
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gen.ggettext import sgettext as _ from gen.ggettext import sgettext as _
from functools import partial
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -118,24 +119,26 @@ class RelGraphReport(Report):
self.database = database self.database = database
menu = options_class.menu menu = options_class.menu
self.includeid = menu.get_option_by_name('incid').get_value() get_option_by_name = options_class.menu.get_option_by_name
self.includedates = menu.get_option_by_name('incdate').get_value() get_value = lambda name: get_option_by_name(name).get_value()
self.includeurl = menu.get_option_by_name('url').get_value()
self.includeimg = menu.get_option_by_name('includeImages').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.show_families = menu.get_option_by_name('showfamily').get_value()
self.just_years = menu.get_option_by_name('justyears').get_value()
self.use_place = menu.get_option_by_name('use_place').get_value()
self.use_subgraphs = menu.get_option_by_name('usesubgraphs').get_value()
self.colorize = menu.get_option_by_name('color').get_value() self.includeid = get_value('incid')
color_males = menu.get_option_by_name('colormales').get_value() self.includedates = get_value('incdate')
color_females = menu.get_option_by_name('colorfemales').get_value() self.includeurl = get_value('url')
color_unknown = menu.get_option_by_name('colorunknown').get_value() self.includeimg = get_value('includeImages')
color_families = menu.get_option_by_name('colorfamilies').get_value() self.imgpos = get_value('imageOnTheSide')
self.use_roundedcorners = get_value('useroundedcorners')
self.adoptionsdashed = get_value('dashed')
self.show_families = get_value('showfamily')
self.just_years = get_value('justyears')
self.use_place = get_value('use_place')
self.use_subgraphs = get_value('usesubgraphs')
self.colorize = get_value('color')
color_males = get_value('colormales')
color_females = get_value('colorfemales')
color_unknown = get_value('colorunknown')
color_families = get_value('colorfamilies')
self.colors = { self.colors = {
'male': color_males, 'male': color_males,
'female': color_females, 'female': color_females,
@ -143,7 +146,7 @@ class RelGraphReport(Report):
'family': color_families 'family': color_families
} }
arrow_str = menu.get_option_by_name('arrow').get_value() arrow_str = get_value('arrow')
if 'd' in arrow_str: if 'd' in arrow_str:
self.arrowheadstyle = 'normal' self.arrowheadstyle = 'normal'
else: else:
@ -152,7 +155,7 @@ class RelGraphReport(Report):
self.arrowtailstyle = 'normal' self.arrowtailstyle = 'normal'
else: else:
self.arrowtailstyle = 'none' self.arrowtailstyle = 'none'
filter_option = options_class.menu.get_option_by_name('filter') filter_option = get_option_by_name('filter')
self._filter = filter_option.get_filter() self._filter = filter_option.get_filter()
def write_report(self): def write_report(self):
@ -467,18 +470,18 @@ class RelGraphOptions(MenuReportOptions):
def add_menu_options(self, menu): def add_menu_options(self, menu):
################################ ################################
category_name = _("Report Options") add_option = partial(menu.add_option, _("Report Options"))
################################ ################################
self.__filter = FilterOption(_("Filter"), 0) self.__filter = FilterOption(_("Filter"), 0)
self.__filter.set_help( self.__filter.set_help(
_("Determines what people are included in the graph")) _("Determines what people are included in the graph"))
menu.add_option(category_name, "filter", self.__filter) add_option("filter", self.__filter)
self.__filter.connect('value-changed', self.__filter_changed) self.__filter.connect('value-changed', self.__filter_changed)
self.__pid = PersonOption(_("Filter Person")) self.__pid = PersonOption(_("Filter Person"))
self.__pid.set_help(_("The center person for the filter")) self.__pid.set_help(_("The center person for the filter"))
menu.add_option(category_name, "pid", self.__pid) add_option("pid", self.__pid)
self.__pid.connect('value-changed', self.__update_filters) self.__pid.connect('value-changed', self.__update_filters)
self.__update_filters() self.__update_filters()
@ -487,20 +490,20 @@ class RelGraphOptions(MenuReportOptions):
_("Include Birth, Marriage and Death dates"), True) _("Include Birth, Marriage and Death dates"), True)
self.incdate.set_help(_("Include the dates that the individual was " self.incdate.set_help(_("Include the dates that the individual was "
"born, got married and/or died in the graph labels.")) "born, got married and/or died in the graph labels."))
menu.add_option(category_name, "incdate", self.incdate) add_option("incdate", self.incdate)
self.incdate.connect('value-changed', self.__include_dates_changed) self.incdate.connect('value-changed', self.__include_dates_changed)
self.justyears = BooleanOption(_("Limit dates to years only"), False) self.justyears = BooleanOption(_("Limit dates to years only"), False)
self.justyears.set_help(_("Prints just dates' year, neither " self.justyears.set_help(_("Prints just dates' year, neither "
"month or day nor date approximation " "month or day nor date approximation "
"or interval are shown.")) "or interval are shown."))
menu.add_option(category_name, "justyears", self.justyears) add_option("justyears", self.justyears)
use_place = BooleanOption(_("Use place when no date"), True) use_place = BooleanOption(_("Use place when no date"), True)
use_place.set_help(_("When no birth, marriage, or death date is " use_place.set_help(_("When no birth, marriage, or death date is "
"available, the correspondent place field " "available, the correspondent place field "
"will be used.")) "will be used."))
menu.add_option(category_name, "use_place", use_place) add_option("use_place", use_place)
url = BooleanOption(_("Include URLs"), False) url = BooleanOption(_("Include URLs"), False)
url.set_help(_("Include a URL in each graph node so " url.set_help(_("Include a URL in each graph node so "
@ -508,17 +511,17 @@ class RelGraphOptions(MenuReportOptions):
"generated that contain active links " "generated that contain active links "
"to the files generated by the 'Narrated " "to the files generated by the 'Narrated "
"Web Site' report.")) "Web Site' report."))
menu.add_option(category_name, "url", url) add_option("url", url)
incid = BooleanOption(_("Include IDs"), False) incid = BooleanOption(_("Include IDs"), False)
incid.set_help(_("Include individual and family IDs.")) incid.set_help(_("Include individual and family IDs."))
menu.add_option(category_name, "incid", incid) add_option("incid", incid)
self.__include_images = BooleanOption( self.__include_images = BooleanOption(
_('Include thumbnail images of people'), False) _('Include thumbnail images of people'), False)
self.__include_images.set_help( self.__include_images.set_help(
_("Whether to include thumbnails of people.")) _("Whether to include thumbnails of people."))
menu.add_option(category_name, "includeImages", self.__include_images) add_option("includeImages", self.__include_images)
self.__include_images.connect('value-changed', self.__image_changed) self.__include_images.connect('value-changed', self.__image_changed)
self.__image_on_side = EnumeratedListOption(_("Thumbnail Location"), 0) self.__image_on_side = EnumeratedListOption(_("Thumbnail Location"), 0)
@ -527,10 +530,10 @@ class RelGraphOptions(MenuReportOptions):
self.__image_on_side.set_help( self.__image_on_side.set_help(
_("Where the thumbnail image should appear " _("Where the thumbnail image should appear "
"relative to the name")) "relative to the name"))
menu.add_option(category_name, "imageOnTheSide", self.__image_on_side) add_option("imageOnTheSide", self.__image_on_side)
################################ ################################
category_name = _("Graph Style") add_option = partial(menu.add_option, _("Graph Style"))
################################ ################################
color = EnumeratedListOption(_("Graph coloring"), 'filled') color = EnumeratedListOption(_("Graph coloring"), 'filled')
@ -539,49 +542,49 @@ class RelGraphOptions(MenuReportOptions):
color.set_help(_("Males will be shown with blue, females " color.set_help(_("Males will be shown with blue, females "
"with red. If the sex of an individual " "with red. If the sex of an individual "
"is unknown it will be shown with gray.")) "is unknown it will be shown with gray."))
menu.add_option(category_name, "color", color) add_option("color", color)
color_males = ColorOption(_('Males'), '#e0e0ff') color_males = ColorOption(_('Males'), '#e0e0ff')
color_males.set_help(_('The colour to use to display men.')) color_males.set_help(_('The colour to use to display men.'))
menu.add_option(category_name, 'colormales', color_males) add_option('colormales', color_males)
color_females = ColorOption(_('Females'), '#ffe0e0') color_females = ColorOption(_('Females'), '#ffe0e0')
color_females.set_help(_('The colour to use to display women.')) color_females.set_help(_('The colour to use to display women.'))
menu.add_option(category_name, 'colorfemales', color_females) add_option('colorfemales', color_females)
color_unknown = ColorOption(_('Unknown'), '#e0e0e0') color_unknown = ColorOption(_('Unknown'), '#e0e0e0')
color_unknown.set_help( color_unknown.set_help(
_('The colour to use when the gender is unknown.') _('The colour to use when the gender is unknown.')
) )
menu.add_option(category_name, 'colorunknown', color_unknown) add_option('colorunknown', color_unknown)
color_family = ColorOption(_('Families'), '#ffffe0') color_family = ColorOption(_('Families'), '#ffffe0')
color_family.set_help(_('The colour to use to display families.')) color_family.set_help(_('The colour to use to display families.'))
menu.add_option(category_name, 'colorfamilies', color_family) add_option('colorfamilies', color_family)
arrow = EnumeratedListOption(_("Arrowhead direction"), 'd') arrow = EnumeratedListOption(_("Arrowhead direction"), 'd')
for i in range( 0, len(_ARROWS) ): for i in range( 0, len(_ARROWS) ):
arrow.add_item(_ARROWS[i]["value"], _ARROWS[i]["name"]) arrow.add_item(_ARROWS[i]["value"], _ARROWS[i]["name"])
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) add_option("arrow", arrow)
roundedcorners = BooleanOption( # see bug report #2180 roundedcorners = BooleanOption( # see bug report #2180
_("Use rounded corners"), False) _("Use rounded corners"), False)
roundedcorners.set_help( roundedcorners.set_help(
_("Use rounded corners to differentiate " _("Use rounded corners to differentiate "
"between women and men.")) "between women and men."))
menu.add_option(category_name, "useroundedcorners", roundedcorners) add_option("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 "
"as dotted lines in the graph.")) "as dotted lines in the graph."))
menu.add_option(category_name, "dashed", dashed) add_option("dashed", dashed)
showfamily = BooleanOption(_("Show family nodes"), True) showfamily = BooleanOption(_("Show family nodes"), True)
showfamily.set_help(_("Families will show up as ellipses, linked " showfamily.set_help(_("Families will show up as ellipses, linked "
"to parents and children.")) "to parents and children."))
menu.add_option(category_name, "showfamily", showfamily) add_option("showfamily", showfamily)
def __update_filters(self): def __update_filters(self):
""" """