svn: r3851
This commit is contained in:
Alex Roitman 2005-01-01 02:41:37 +00:00
parent 2f6935fab5
commit 1432e9e8cd
3 changed files with 8 additions and 33 deletions

View File

@ -65,15 +65,8 @@ class AncestorReport(Report.Report):
This report needs the following parameters (class variables) This report needs the following parameters (class variables)
that come in the options class. that come in the options class.
max_gen - Maximum number of generations to include. gen - Maximum number of generations to include.
pg_breaks - Whether to include page breaks between generations. pagebbg - Whether to include page breaks between generations.
document - BaseDoc instance for the output file. Any class derived
from BaseDoc may be used
output - name of the output file.
None if report is not a standalone, in which case
somebody must take care of opening and initializing report
prior to writing.
newpage - if True, newpage is made before writing a report
""" """
@ -83,7 +76,7 @@ class AncestorReport(Report.Report):
(self.max_generations,self.pgbrk) \ (self.max_generations,self.pgbrk) \
= options_class.get_report_generations() = options_class.get_report_generations()
def filter(self,person_handle,index,generation=1): def apply_filter(self,person_handle,index,generation=1):
if not person_handle or generation >= self.max_generations: if not person_handle or generation >= self.max_generations:
return return
self.map[index] = person_handle self.map[index] = person_handle
@ -92,12 +85,12 @@ class AncestorReport(Report.Report):
family_handle = person.get_main_parents_family_handle() family_handle = person.get_main_parents_family_handle()
if family_handle: if family_handle:
family = self.database.get_family_from_handle(family_handle) family = self.database.get_family_from_handle(family_handle)
self.filter(family.get_father_handle(),index*2,generation+1) self.apply_filter(family.get_father_handle(),index*2,generation+1)
self.filter(family.get_mother_handle(),(index*2)+1,generation+1) self.apply_filter(family.get_mother_handle(),(index*2)+1,generation+1)
def write_report(self): def write_report(self):
self.filter(self.start_person.get_handle(),1) self.apply_filter(self.start_person.get_handle(),1)
name = self.start_person.get_primary_name().get_regular_name() name = self.start_person.get_primary_name().get_regular_name()
self.doc.start_paragraph("AHN-Title") self.doc.start_paragraph("AHN-Title")

View File

@ -73,15 +73,8 @@ class DescendantReport(Report.Report):
This report needs the following parameters (class variables) This report needs the following parameters (class variables)
that come in the options class. that come in the options class.
max_gen - Maximum number of generations to include. gen - Maximum number of generations to include.
pg_breaks - Whether to include page breaks between generations. pagebbg - Whether to include page breaks between generations.
document - BaseDoc instance for the output file. Any class derived
from BaseDoc may be used
output - name of the output file.
None if report is not a standalone, in which case
somebody must take care of opening and initializing report
prior to writing.
newpage - if True, newpage is made before writing a report
""" """

View File

@ -69,17 +69,6 @@ class IndivSummary(Report.Report):
person - currently selected person person - currently selected person
options_class - instance of the Options class for this report options_class - instance of the Options class for this report
This report needs the following parameters (class variables)
that come in the options class.
document - BaseDoc instance for the output file. Any class derived
from BaseDoc may be used
output - name of the output file.
None if report is not a standalone, in which case
somebody must take care of opening and initializing report
prior to writing.
newpage - if True, newpage is made before writing a report
""" """
Report.Report.__init__(self,database,person,options_class) Report.Report.__init__(self,database,person,options_class)