* src/RelLib.py, etc.: convert get_id to get_handle
svn: r3290
This commit is contained in:
@@ -193,7 +193,7 @@ class AncestorChart:
|
||||
self.font = self.doc.style_list["AC2-Normal"].get_font()
|
||||
self.tfont = self.doc.style_list["AC2-Title"].get_font()
|
||||
|
||||
self.filter(self.start.get_id(),1)
|
||||
self.filter(self.start.get_handle(),1)
|
||||
|
||||
keys = self.map.keys()
|
||||
keys.sort()
|
||||
@@ -204,18 +204,18 @@ class AncestorChart:
|
||||
self.genchart.set(key,self.map[key])
|
||||
self.calc()
|
||||
|
||||
def filter(self,person_id,index):
|
||||
def filter(self,person_handle,index):
|
||||
"""traverse the ancestors recursively until either the end
|
||||
of a line is found, or until we reach the maximum number of
|
||||
generations that we want to deal with"""
|
||||
|
||||
if (not person_id) or (index >= 2**self.max_generations):
|
||||
if (not person_handle) or (index >= 2**self.max_generations):
|
||||
return
|
||||
self.map[index] = person_id
|
||||
self.map[index] = person_handle
|
||||
|
||||
self.text[index] = []
|
||||
|
||||
subst = SubstKeywords(self.database,person_id)
|
||||
subst = SubstKeywords(self.database,person_handle)
|
||||
|
||||
for line in self.display:
|
||||
self.text[index].append(subst.replace(line))
|
||||
@@ -225,12 +225,12 @@ class AncestorChart:
|
||||
|
||||
self.lines = max(self.lines,len(self.text[index]))
|
||||
|
||||
person = self.database.try_to_find_person_from_id(person_id)
|
||||
family_id = person.get_main_parents_family_id()
|
||||
if family_id:
|
||||
family = self.database.find_family_from_id(family_id)
|
||||
self.filter(family.get_father_id(),index*2)
|
||||
self.filter(family.get_mother_id(),(index*2)+1)
|
||||
person = self.database.try_to_find_person_from_handle(person_handle)
|
||||
family_handle = person.get_main_parents_family_handle()
|
||||
if family_handle:
|
||||
family = self.database.find_family_from_handle(family_handle)
|
||||
self.filter(family.get_father_handle(),index*2)
|
||||
self.filter(family.get_mother_handle(),(index*2)+1)
|
||||
|
||||
def write_report(self):
|
||||
|
||||
@@ -528,13 +528,13 @@ def report(database,person):
|
||||
_style_file = "ancestor_chart2.xml"
|
||||
_style_name = "default"
|
||||
|
||||
_person_id = ""
|
||||
_person_handle = ""
|
||||
_max_gen = 10
|
||||
_disp_format = [ "$n", "%s $b" % _BORN, "%s $d" % _DIED ]
|
||||
_compress = 1
|
||||
_scale = 1
|
||||
_title = ""
|
||||
_options = ( _person_id, _max_gen, _disp_format, _title, _compress, _scale)
|
||||
_options = ( _person_handle, _max_gen, _disp_format, _title, _compress, _scale)
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
#
|
||||
@@ -658,7 +658,7 @@ class AncestorChartBareDialog(Report.BareReportDialog):
|
||||
|
||||
if self.new_person:
|
||||
self.person = self.new_person
|
||||
self.options = ( self.person.get_id(), self.max_gen, self.report_text,
|
||||
self.options = ( self.person.get_handle(), self.max_gen, self.report_text,
|
||||
self.the_title, self.do_compress, self.do_scale )
|
||||
self.style_name = self.selected_style.get_name()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user