* src/plugins/BookReport.py (BookReportDialog.make_document):

Move item initialization here (was in make_report).
* src/plugins/DetDescendantReport.py: Remove empty setup().
* src/plugins/AncestorReport.py: Likewise.
* src/plugins/Ancestors.py: Likewise.
* src/plugins/DescendReport.py: Likewise.
* src/plugins/FtmStyleAncestors.py: Likewise.
* src/plugins/FamilyGroup.py: Likewise.
* src/plugins/DetAncestralReport.py: Likewise.


svn: r1874
This commit is contained in:
Alex Roitman 2003-07-13 00:09:29 +00:00
parent 96684939fe
commit 4de76df6f6
9 changed files with 21 additions and 32 deletions

View File

@ -1,6 +1,17 @@
2003-07-12 Alex Roitman <shura@alex.neuro.umn.edu>
* src/Plugins.py (PluginDialog.build_tree): Remove reverse() call.
* doc/gramps-manual/C/gramps-manual.xml: More corrections.
* src/plugins/BookReport.py (BookReportDialog.make_document):
Move item initialization here (was in make_report).
This is necessary to define all the styles, including non-paragraph
ones, before opening single book doc.
* src/plugins/DetDescendantReport.py: Remove empty setup().
* src/plugins/AncestorReport.py: Likewise.
* src/plugins/Ancestors.py: Likewise.
* src/plugins/DescendReport.py: Likewise.
* src/plugins/FtmStyleAncestors.py: Likewise.
* src/plugins/FamilyGroup.py: Likewise.
* src/plugins/DetAncestralReport.py: Likewise.
2003-07-11 Alex Roitman <shura@alex.neuro.umn.edu>
* src/plugins/IndivSummary.py (IndivSummary.__init__):

View File

@ -61,9 +61,6 @@ class AncestorReport(Report.Report):
else:
self.standalone = 0
def setup(self):
pass
def filter(self,person,index,generation=1):
if person == None or generation >= self.max_generations:
return

View File

@ -105,9 +105,6 @@ class AncestorsReport (Report.Report):
else:
self.standalone = 0
def setup(self):
pass
def write_report(self):
if self.newpage:
self.doc.page_break()

View File

@ -864,14 +864,8 @@ class BookReportDialog(Report.ReportDialog):
"""Create a document of the type requested by the user."""
self.doc = self.format(self.selected_style,self.paper,
self.template_name,self.orien)
self.doc.open(self.target_path)
def make_report(self):
"""The actual book report. Start it out, then go through the item list
and call each item's write_book_item method."""
rptlist = []
self.rptlist = []
newpage = 0
for item in self.book.get_item_list():
write_book_item = item.get_write_item()
@ -879,11 +873,15 @@ class BookReportDialog(Report.ReportDialog):
if write_book_item:
obj = write_book_item(self.database,self.person,
self.doc,options,newpage)
obj.setup()
rptlist.append(obj)
self.rptlist.append(obj)
newpage = 1
self.doc.open(self.target_path)
for item in rptlist:
def make_report(self):
"""The actual book report. Start it out, then go through the item list
and call each item's write_book_item method."""
for item in self.rptlist:
item.write_report()
self.doc.close()

View File

@ -69,9 +69,6 @@ class DescendantReport:
else:
self.standalone = 0
def setup(self):
pass
def dump_dates(self, person):
birth = person.getBirth().getDateObj().get_start_date()
death = person.getDeath().getDateObj().get_start_date()

View File

@ -68,9 +68,6 @@ class DetAncestorReport(Report.Report):
else:
self.standalone = 0
def setup(self):
pass
#--------------------------------------------------------------------
#
#

View File

@ -69,8 +69,6 @@ class DetDescendantReport(Report.Report):
else:
self.standalone = 0
def setup(self):
pass
#--------------------------------------------------------------------
#
#

View File

@ -119,9 +119,6 @@ class FamilyGroup:
table.set_column_width(3,40)
self.doc.add_table_style('ChildTable',table)
def setup(self):
pass
def end(self):
if self.standalone:
self.doc.close()

View File

@ -62,9 +62,6 @@ class FtmAncestorReport(Report.Report):
self.sref_map = {}
self.sref_index = 1
def setup(self):
pass
def apply_filter(self,person,index,generation=1):
if person == None or generation > self.max_generations:
return