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

* src/Date.py (get_high_year): Add method to return upper estimate.

Browse Source 
* src/AddSpouse.py: Correctly use upper and lower date estimates.
* src/ChooseParents: Correctly use upper and lower date estimates.


svn: r3565
This commit is contained in:
Alex Roitman
2004-09-21 02:10:23 +00:00
parent 8902c3e35e
commit 523a3b3943
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gramps2/src/ChooseParents.py
View File

@@ -279,27 +279,27 @@ class ChooseParents:
if self.bday and self.bday.get_year_valid():
if pbday and pbday.get_year_valid():
# reject if parents birthdate + 10 > child birthdate
if pbday.get_low_year()+10 > self.bday.get_high_year():
if pbday.get_year()+10 > self.bday.get_high_year():
return 0
# reject if parents birthdate + 90 < child birthdate
if pbday.get_high_year()+90 < self.bday.get_low_year():
if pbday.get_high_year()+90 < self.bday.get_year():
return 0
if pdday and pdday.get_year_valid():
# reject if parents birthdate + 10 > child deathdate
if self.dday and pbday.get_low_year()+10 > self.dday.get_high_year():
if self.dday and pbday.get_year()+10 > self.dday.get_high_year():
return 0
if self.dday and self.dday.get_year_valid():
if pbday and pbday.get_year_valid():
# reject if parents deathday + 3 < childs birth date
if pdday and self.bday and pdday.get_high_year()+3 < self.bday.get_low_year():
if pdday and self.bday and pdday.get_high_year()+3 < self.bday.get_year():
return 0
if pdday and pdday.get_year_valid():
# reject if parents deathday + 150 < childs death date
if pdday.get_high_year() + 150 < self.dday.get_low_year():
if pdday.get_high_year() + 150 < self.dday.get_year():
return 0
return 1