Fixed Pedigree View for new preferred family concept

svn: r856
This commit is contained in:
Don Allingham 2002-03-24 16:49:58 +00:00
parent a96442f263
commit e352461f94
2 changed files with 6 additions and 11 deletions

View File

@ -382,15 +382,10 @@ class PedigreeView:
if depth > 5 or person == None: if depth > 5 or person == None:
return return
family = person.getMainFamily() (family,m,f) = person.getMainFamilyRel()
frel = 0 if family:
mrel = 0 mrel = (m != "Birth")
if family == None: frel = (f != "Birth")
l = person.getAltFamilyList()
if len(l) > 0:
(family,m,f) = l[0]
mrel = (m != "Birth")
frel = (f != "Birth")
list[index] = (person,val) list[index] = (person,val)
if family != None: if family != None:

View File

@ -1120,9 +1120,9 @@ class Person:
"""returns the main Family of the Person, the Family in which the """returns the main Family of the Person, the Family in which the
Person is a natural born child""" Person is a natural born child"""
if len(self.AltFamilyList) == 0: if len(self.AltFamilyList) == 0:
return None return (None,None,None)
else: else:
return self.AltFamilyList return self.AltFamilyList[0]
def setNote(self,text): def setNote(self,text):
"""sets the note attached to the Person to the passed text""" """sets the note attached to the Person to the passed text"""