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

0001617: place/cause option: cause is never included

Browse Source 
svn: r9972
This commit is contained in:
Brian Matherly 2008-02-01 13:04:35 +00:00
parent d45a2fc957
commit 2710bc0fa1
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-02-01 Brian Matherly <brian@gramps-project.org>
* src/plugins/GVRelGraph.py: Fix 0001617: place/cause option: cause is
never included
2008-01-31 Brian Matherly <brian@gramps-project.org> 2008-01-31 Brian Matherly <brian@gramps-project.org>
* src/ReportBase/_Bibliography.py: Fix 0001624: Source reference hyperlinks * src/ReportBase/_Bibliography.py: Fix 0001624: Source reference hyperlinks
do not always work in Narrated Web Site do not always work in Narrated Web Site

19
src/plugins/GVRelGraph.py
View File

@ -93,7 +93,7 @@ class RelGraphReport(Report):
incid - Whether to include IDs. incid - Whether to include IDs.
incdate - Whether to include dates. incdate - Whether to include dates.
justyears - Use years only. justyears - Use years only.
placecause - Whether to replace missing dates with place or cause use_place - Whether to replace missing dates with place
url - Whether to include URLs. url - Whether to include URLs.
inclimg - Include images or not inclimg - Include images or not
imgpos - Image position, above/beside name imgpos - Image position, above/beside name
@ -125,7 +125,7 @@ class RelGraphReport(Report):
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()
self.placecause = menu.get_option_by_name('placecause').get_value() self.use_place = menu.get_option_by_name('use_place').get_value()
self.colorize = menu.get_option_by_name('color').get_value() self.colorize = menu.get_option_by_name('color').get_value()
if self.colorize == 'colored': if self.colorize == 'colored':
self.colors = colored self.colors = colored
@ -387,7 +387,6 @@ class RelGraphReport(Report):
year only year only
complete date complete date
place name place name
cause
empty string empty string
""" """
if event: if event:
@ -396,13 +395,11 @@ class RelGraphReport(Report):
return '%i' % event.get_date_object().get_year() return '%i' % event.get_date_object().get_year()
else: else:
return DateHandler.get_date(event) return DateHandler.get_date(event)
elif self.placecause: elif self.use_place:
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
place = self.database.get_place_from_handle(place_handle) place = self.database.get_place_from_handle(place_handle)
if place and place.get_title(): if place and place.get_title():
return place.get_title() return place.get_title()
else:
return '' #event.get_cause()
return '' return ''
@ -453,11 +450,11 @@ class RelGraphOptions(MenuReportOptions):
"or interval are shown.")) "or interval are shown."))
menu.add_option(category_name, "justyears", justyears) menu.add_option(category_name, "justyears", justyears)
placecause = BooleanOption(_("Place/cause when no date"), True) use_place = BooleanOption(_("Use place when no date"), True)
placecause.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 (or " "available, the correspondent place field "
"cause field when blank place) will be used.")) "will be used."))
menu.add_option(category_name, "placecause", placecause) menu.add_option(category_name, "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 "