Fixed relationship calculator
svn: r627
This commit is contained in:
parent
d42884480f
commit
43852bf81c
@ -133,7 +133,6 @@ def loadData(database, filename, callback=None):
|
|||||||
f.close()
|
f.close()
|
||||||
except IOError,msg:
|
except IOError,msg:
|
||||||
use_gzip = 0
|
use_gzip = 0
|
||||||
f.close()
|
|
||||||
else:
|
else:
|
||||||
use_gzip = 0
|
use_gzip = 0
|
||||||
|
|
||||||
|
@ -226,9 +226,9 @@ class RelCalc:
|
|||||||
text = secondName + get_prefix(firstRel-1,"niece") + firstName + "."
|
text = secondName + get_prefix(firstRel-1,"niece") + firstName + "."
|
||||||
else:
|
else:
|
||||||
if secondRel > firstRel:
|
if secondRel > firstRel:
|
||||||
text = secondName + cousin(secondRel-1,secondRel-firstRel) + firstName + "."
|
text = secondName + cousin(firstRel-1,secondRel-firstRel) + firstName + "."
|
||||||
else:
|
else:
|
||||||
text = secondName + cousin(firstRel-1,firstRel-secondRel) + firstName + "."
|
text = secondName + cousin(secondRel-1,firstRel-secondRel) + firstName + "."
|
||||||
|
|
||||||
text1 = self.glade.get_widget("text1")
|
text1 = self.glade.get_widget("text1")
|
||||||
text1.set_point(0)
|
text1.set_point(0)
|
||||||
|
Loading…
Reference in New Issue
Block a user