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

New 'Include Siblings' feature added.

Browse Source 
and got things ready for the report to go in multiple directions
This commit is contained in:
Craig J. Anderson 2015-04-13 14:11:37 -04:00
parent bb1e5f4e3d
commit 64db425ab0
2 changed files with 328 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

738
gramps/plugins/drawreport/ancestortree.py
View File

File diff suppressed because it is too large Load Diff

13
gramps/plugins/lib/librecurse.py
View File

@ -510,21 +510,26 @@ class AscendPerson(_StopRecurse, _PersonSeen):
if father_handle and mother_handle: if father_handle and mother_handle:
break break
# we have a valid person, add him/her # we have a valid person, add him/her
self._add_person((generation, index), person_handle, fam_handle) self._add_person((generation, index), person_handle, fam_handle)
# has the user canceled recursion? # has the user canceled recursion?
if not self.can_recurse(): if not self.can_recurse():
self.continue_recursion() self.continue_recursion()
return return
# Recursively call the function. It is okay if the handle is None, # Recursively call the function. It is okay if the handle is None,
self.__iterate(father_handle, generation+1, index*2) #recurse on dad self.__iterate(father_handle, generation+1, index*2) #recurse on dad
if generation < self.max_generations or self.fill_out > 0: if generation < self.max_generations:
if father_handle is not None: # Stil winin max_generations if father_handle is not None: # Stil winin max_generations
self.add_marriage((generation+1, index*2), father_handle, fam_handle) self.add_marriage((generation+1, index*2), father_handle, fam_handle)
else: elif mother_handle is not None:
self.add_marriage((generation+1, index*2), mother_handle, fam_handle) self.add_marriage((generation+1, index*2), mother_handle, fam_handle)
elif fam_handle is not None:
self.add_marriage((generation+1, index*2), None, fam_handle)
elif self.fill_out > 0:
self.add_marriage((generation+1, index*2), None, None)
if not self.can_recurse(): if not self.can_recurse():
self.continue_recursion() self.continue_recursion()
return return