0002081: Fixed two bugs, error when asymmetric mother/father and fixed off-by-one spacing issue

svn: r10585
This commit is contained in:
Doug Blank 2008-04-19 01:13:44 +00:00
parent 8956ee85f7
commit ce002bf7a6

View File

@ -482,9 +482,9 @@ class PedigreeGramplet(Gramplet):
retval += " " retval += " "
if retval[-1] == ' ': if retval[-1] == ' ':
if what == 'sf': if what == 'sf':
retval = retval[:-6] + " /" retval = retval[:-6] + "/"
elif what == 'sm': elif what == 'sm':
retval = retval[:-6] + " \\" retval = retval[:-6] + "\\"
elif retval.endswith("| |"): elif retval.endswith("| |"):
retval = retval[:-6] + "+" retval = retval[:-6] + "+"
return retval + "---" return retval + "---"
@ -501,11 +501,14 @@ class PedigreeGramplet(Gramplet):
if len(family_list) > 0: if len(family_list) > 0:
family = self.dbstate.db.get_family_from_handle(family_list[0]) family = self.dbstate.db.get_family_from_handle(family_list[0])
father = family.get_father_handle() father = family.get_father_handle()
mother = family.get_mother_handle()
if father: if father:
self.process_person(father, generation + 1, "f") self.process_person(father, generation + 1, "f")
self.set_box(generation, 1) self.set_box(generation, 1)
self.process_person(father, generation + 1, "sf") self.process_person(father, generation + 1, "sf")
self.process_person(father, generation + 1, "m") self.process_person(father, generation + 1, "m")
elif mother:
self.set_box(generation, 1)
elif what[0] == "s": elif what[0] == "s":
boxes = self.get_boxes(generation, what) boxes = self.get_boxes(generation, what)
if what[-1] == 'f': if what[-1] == 'f':