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

Fixed several reported bugs

Browse Source 
svn: r999
This commit is contained in:
Don Allingham 2002-05-19 00:03:59 +00:00
parent f43c587f2b
commit 55ff500cfe
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gramps/src/plugins/DetAncestralReport.py
View File

@ -82,11 +82,28 @@ class DetAncestorReport(Report):
#print "Children= ", len(family.getChildList()) #print "Children= ", len(family.getChildList())
if num_children > 0: if num_children > 0:
self.doc.start_paragraph("ChildTitle") self.doc.start_paragraph("ChildTitle")
mother= family.getMother().getPrimaryName().getRegularName() mom = family.getMother()
father= family.getFather().getPrimaryName().getRegularName() dad = family.getFather()
if mom:
mother = mom.getPrimaryName().getRegularName()
if dad:
father = dad.getPrimaryName().getRegularName()
if num_children == 1: if num_children == 1:
if mom and dad:
self.doc.write_text(_("Child of %s and %s is:") % (mother, father)) self.doc.write_text(_("Child of %s and %s is:") % (mother, father))
else: self.doc.write_text(_("Children of %s and %s are:") % (mother, father)) elif mom:
self.doc.write_text(_("Child of %s is:") % mother)
elif dad:
self.doc.write_text(_("Child of %s is:") % father)
else:
if mom and dad:
self.doc.write_text(_("Children of %s and %s are:") % (mother, father))
elif mom:
self.doc.write_text(_("Children of %s are:") % mother)
elif dad:
self.doc.write_text(_("Children of %s are:") % father)
self.doc.end_paragraph() self.doc.end_paragraph()
for child in family.getChildList(): for child in family.getChildList():

4
gramps/src/plugins/GraphViz.py
View File

@ -287,9 +287,9 @@ def write_dot(file, ind_list, orien, width, height, tb_margin,
file.write("center=1;\n") file.write("center=1;\n")
file.write("margin=0.5;\n") file.write("margin=0.5;\n")
file.write("ratio=fill;\n") file.write("ratio=fill;\n")
file.write("size=\"%3.1f,%3.1f\";\n" % ((width*hpages)-(lr_margin*2)-((hpages-1)*1.0), file.write("size=\"%3.1fin,%3.1fin\";\n" % ((width*hpages)-(lr_margin*2)-((hpages-1)*1.0),
(height*vpages)-(tb_margin*2)-((vpages-1)*1.0))) (height*vpages)-(tb_margin*2)-((vpages-1)*1.0)))
file.write("page=\"%3.1f,%3.1f\";\n" % (width,height)) file.write("page=\"%3.1fin,%3.1fin\";\n" % (width,height))
if orien == PAPER_LANDSCAPE: if orien == PAPER_LANDSCAPE:
file.write("rotate=90;\n") file.write("rotate=90;\n")