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

* src/plugins/DescendReport.py (dump): Initialize child list for

Browse Source 
each family.


svn: r5550
This commit is contained in:
Alex Roitman 2005-12-15 00:00:47 +00:00
parent 10b86050d1
commit 8c0ad73c2e
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps2/ChangeLog
View File

@ -1,6 +1,8 @@
2005-12-14 Alex Roitman <shura@gramps-project.org> 2005-12-14 Alex Roitman <shura@gramps-project.org>
* src/plugins/PatchNames.py: Fix title/name mixup, only detect new * src/plugins/PatchNames.py: Fix title/name mixup, only detect new
title, keep old title, keep old prefix. title, keep old title, keep old prefix.
* src/plugins/DescendReport.py (dump): Initialize child list for
each family.
2005-12-12 Alex Roitman <shura@gramps-project.org> 2005-12-12 Alex Roitman <shura@gramps-project.org>
* configure.in: bump up the version number. * configure.in: bump up the version number.

18
gramps2/src/plugins/DescendReport.py
View File

@ -112,13 +112,15 @@ class DescendantReport(Report.Report):
if birth: if birth:
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
birth_place = self.database.get_place_from_handle(bplace_handle).get_title() birth_place = self.database.get_place_from_handle(
bplace_handle).get_title()
death_place = "" death_place = ""
if death: if death:
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle:
death_place = self.database.get_place_from_handle(dplace_handle).get_title() death_place = self.database.get_place_from_handle(
dplace_handle).get_title()
if birth_year_valid: if birth_year_valid:
if birth_place: if birth_place:
@ -163,7 +165,6 @@ class DescendantReport(Report.Report):
if level >= self.max_generations: if level >= self.max_generations:
return return
childlist = []
for family_handle in person.get_family_handle_list(): for family_handle in person.get_family_handle_list():
family = self.database.get_family_from_handle(family_handle) family = self.database.get_family_from_handle(family_handle)
@ -176,10 +177,9 @@ class DescendantReport(Report.Report):
self.dump_dates(spouse) self.dump_dates(spouse)
self.doc.end_paragraph() self.doc.end_paragraph()
for child_handle in family.get_child_handle_list(): childlist = family.get_child_handle_list()[:]
childlist.append(child_handle)
childlist.sort(self.by_birthdate) childlist.sort(self.by_birthdate)
for child_handle in childlist: for child_handle in childlist:
child = self.database.get_person_from_handle(child_handle) child = self.database.get_person_from_handle(child_handle)
self.dump(level+1,child) self.dump(level+1,child)
@ -230,7 +230,8 @@ class DescendantOptions(ReportOptions.ReportOptions):
p.set_bottom_margin(ReportUtils.pt2cm(f.get_size()*0.125)) p.set_bottom_margin(ReportUtils.pt2cm(f.get_size()*0.125))
p.set_first_indent(-0.5) p.set_first_indent(-0.5)
p.set_left_margin(min(10.0,float(i-0.5))) p.set_left_margin(min(10.0,float(i-0.5)))
p.set_description(_("The style used for the level %d display.") % i) p.set_description(_("The style used for the "
"level %d display.") % i)
default_style.add_style("DR-Level%d" % i,p) default_style.add_style("DR-Level%d" % i,p)
p = BaseDoc.ParagraphStyle() p = BaseDoc.ParagraphStyle()
@ -238,7 +239,8 @@ class DescendantOptions(ReportOptions.ReportOptions):
p.set_top_margin(ReportUtils.pt2cm(f.get_size()*0.125)) p.set_top_margin(ReportUtils.pt2cm(f.get_size()*0.125))
p.set_bottom_margin(ReportUtils.pt2cm(f.get_size()*0.125)) p.set_bottom_margin(ReportUtils.pt2cm(f.get_size()*0.125))
p.set_left_margin(min(10.0,float(i-0.5))) p.set_left_margin(min(10.0,float(i-0.5)))
p.set_description(_("The style used for the spouse level %d display.") % i) p.set_description(_("The style used for the "
"spouse level %d display.") % i)
default_style.add_style("DR-Spouse%d" % i,p) default_style.add_style("DR-Spouse%d" % i,p)
#------------------------------------------------------------------------ #------------------------------------------------------------------------