From e350d5c596289f5f9f388d85d8d4322611750f59 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sat, 1 Jan 2005 02:41:37 +0000 Subject: [PATCH] Update svn: r3851 --- src/plugins/AncestorReport.py | 19 ++++++------------- src/plugins/DescendReport.py | 11 ++--------- src/plugins/IndivSummary.py | 11 ----------- 3 files changed, 8 insertions(+), 33 deletions(-) diff --git a/src/plugins/AncestorReport.py b/src/plugins/AncestorReport.py index 5cd2467d5..e0d8feedd 100644 --- a/src/plugins/AncestorReport.py +++ b/src/plugins/AncestorReport.py @@ -65,15 +65,8 @@ class AncestorReport(Report.Report): This report needs the following parameters (class variables) that come in the options class. - max_gen - Maximum number of generations to include. - pg_breaks - 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 + gen - Maximum number of generations to include. + pagebbg - Whether to include page breaks between generations. """ @@ -83,7 +76,7 @@ class AncestorReport(Report.Report): (self.max_generations,self.pgbrk) \ = 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: return self.map[index] = person_handle @@ -92,12 +85,12 @@ class AncestorReport(Report.Report): family_handle = person.get_main_parents_family_handle() if family_handle: family = self.database.get_family_from_handle(family_handle) - self.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_father_handle(),index*2,generation+1) + self.apply_filter(family.get_mother_handle(),(index*2)+1,generation+1) 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() self.doc.start_paragraph("AHN-Title") diff --git a/src/plugins/DescendReport.py b/src/plugins/DescendReport.py index f23f56704..ae6885650 100644 --- a/src/plugins/DescendReport.py +++ b/src/plugins/DescendReport.py @@ -73,15 +73,8 @@ class DescendantReport(Report.Report): This report needs the following parameters (class variables) that come in the options class. - max_gen - Maximum number of generations to include. - pg_breaks - 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 + gen - Maximum number of generations to include. + pagebbg - Whether to include page breaks between generations. """ diff --git a/src/plugins/IndivSummary.py b/src/plugins/IndivSummary.py index fab22eecb..bbd76d36a 100644 --- a/src/plugins/IndivSummary.py +++ b/src/plugins/IndivSummary.py @@ -69,17 +69,6 @@ class IndivSummary(Report.Report): person - currently selected person 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)