0001973: Show all or no half siblings in Detailed Ancestral Report

svn: r11626
This commit is contained in:
Brian Matherly 2009-01-15 16:28:57 +00:00
parent 042379ae5b
commit 58222b68b1

View File

@ -163,12 +163,12 @@ class DetAncestorReport(Report):
self.doc.page_break() self.doc.page_break()
self.doc.start_paragraph("DAR-Generation") self.doc.start_paragraph("DAR-Generation")
text = _("Generation %d") % (generation+1) text = _("Generation %d") % (generation+1)
mark = BaseDoc.IndexMark(text,BaseDoc.INDEX_TYPE_TOC,2) mark = BaseDoc.IndexMark(text, BaseDoc.INDEX_TYPE_TOC, 2)
self.doc.write_text(text,mark) self.doc.write_text(text, mark)
self.doc.end_paragraph() self.doc.end_paragraph()
generation = generation + 1 generation = generation + 1
if self.childref: if self.childref:
self.prev_gen_handles= self.gen_handles.copy() self.prev_gen_handles = self.gen_handles.copy()
self.gen_handles.clear() self.gen_handles.clear()
person_handle = self.map[key] person_handle = self.map[key]
@ -181,6 +181,7 @@ class DetAncestorReport(Report):
family = self.database.get_family_from_handle(family_handle) family = self.database.get_family_from_handle(family_handle)
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
if mother_handle is None or \ if mother_handle is None or \
mother_handle not in self.map.values() or \
person.get_gender() == gen.lib.Person.FEMALE: person.get_gender() == gen.lib.Person.FEMALE:
if self.listchildren: if self.listchildren:
self.write_children(family) self.write_children(family)