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

* src/gramps.glade: change "Edit..." buttons to an image

Browse Source 
* src/plugins/CountAncestors.py: handle duplicates across
generations


svn: r3669
This commit is contained in:
Don Allingham 2004-10-25 02:37:18 +00:00
parent 6c9873363d
commit e185199d6a
4 changed files with 342 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-24 Don Allingham <dallingham@users.sourceforge.net>
* src/gramps.glade: change "Edit..." buttons to an image
* src/plugins/CountAncestors.py: handle duplicates across
generations
2004-10-24 Alex Roitman <shura@alex.neuro.umn.edu> 2004-10-24 Alex Roitman <shura@alex.neuro.umn.edu>
* src/MediaView.py: Typo. * src/MediaView.py: Typo.

2
src/ReadGedcom.py
View File

@ -204,8 +204,6 @@ def import2(database, filename, cb, codeset, use_trans):
if close: if close:
statusWindow.destroy() statusWindow.destroy()
print database.person_map.stat()
if cb: if cb:
statusWindow.destroy() statusWindow.destroy()
cb(1) cb(1)

641
src/gramps.glade
View File

File diff suppressed because it is too large Load Diff

7
src/plugins/CountAncestors.py
View File

@ -50,6 +50,7 @@ class CountAncestors:
"destroy_passed_object" : Utils.destroy_passed_object, "destroy_passed_object" : Utils.destroy_passed_object,
}) })
thisgen = Set() thisgen = Set()
all = Set()
allgen = 0 allgen = 0
thisgen.add(person.get_handle()) thisgen.add(person.get_handle())
@ -75,10 +76,12 @@ class CountAncestors:
family = database.get_family_from_handle(family_handle) family = database.get_family_from_handle(family_handle)
father_handle = family.get_father_handle() father_handle = family.get_father_handle()
mother_handle = family.get_mother_handle() mother_handle = family.get_mother_handle()
if father_handle: if father_handle and father_handle not in all:
thisgen.add(father_handle) thisgen.add(father_handle)
if mother_handle: all.add(father_handle)
if mother_handle and mother_handle not in all:
thisgen.add(mother_handle) thisgen.add(mother_handle)
all.add(mother_handle)
allgen += len(thisgen) allgen += len(thisgen)
text += _("Total ancestors in generations %d to -1 is %d.\n") % (gen, allgen) text += _("Total ancestors in generations %d to -1 is %d.\n") % (gen, allgen)