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

* src/plugins/DetDescendantReport.py (write_person): Write

Browse Source 
images before the paragraph start; (insert_images): Don't start
and end pargraphs.
* src/plugins/DetAncestralReport.py: (write_person): Write
images before the paragraph start; (insert_images): Don't start
and end pargraphs.


svn: r2890
This commit is contained in:
Alex Roitman 2004-02-22 05:17:14 +00:00
parent 15ceba32c7
commit 0bf9c255c7
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -5,6 +5,13 @@
* src/gramps_main.py: Corrections. * src/gramps_main.py: Corrections.
* src/Bookmarks.py: Corrections. * src/Bookmarks.py: Corrections.
* src/plugins/DetDescendantReport.py (write_person): Write
images before the paragraph start; (insert_images): Don't start
and end pargraphs.
* src/plugins/DetAncestralReport.py: (write_person): Write
images before the paragraph start; (insert_images): Don't start
and end pargraphs.
2004-02-20 Alex Roitman <shura@alex.neuro.umn.edu> 2004-02-20 Alex Roitman <shura@alex.neuro.umn.edu>
* src/EditPerson.py: Corrections. * src/EditPerson.py: Corrections.
* src/EditSource.py: Use parent class. Use windows menu. * src/EditSource.py: Use parent class. Use windows menu.

13
src/plugins/DetAncestralReport.py
View File

@ -198,12 +198,12 @@ class DetAncestorReport(Report.Report):
def write_person(self, key, rptOptions): def write_person(self, key, rptOptions):
"""Output birth, death, parentage, marriage and notes information """ """Output birth, death, parentage, marriage and notes information """
self.doc.start_paragraph("DAR-First-Entry","%s." % str(key))
person = self.map[key] person = self.map[key]
if rptOptions.addImages == reportOptions.Yes: if rptOptions.addImages == reportOptions.Yes:
self.insert_images(person) self.insert_images(person)
self.doc.start_paragraph("DAR-First-Entry","%s." % str(key))
name = person.get_primary_name().get_regular_name() name = person.get_primary_name().get_regular_name()
if rptOptions.firstName == reportOptions.Yes: if rptOptions.firstName == reportOptions.Yes:
@ -533,11 +533,11 @@ class DetAncestorReport(Report.Report):
firstName= fam.get_father_id().get_primary_name().get_first_name() firstName= fam.get_father_id().get_primary_name().get_first_name()
if person != "": if person != "":
self.doc.start_paragraph("DAR-Entry")
if rptOptions.addImages == reportOptions.Yes: if rptOptions.addImages == reportOptions.Yes:
self.insert_images(ind) self.insert_images(ind)
self.doc.start_paragraph("DAR-Entry")
if rptOptions.firstName == reportOptions.No: if rptOptions.firstName == reportOptions.No:
firstName= heshe firstName= heshe
@ -563,16 +563,11 @@ class DetAncestorReport(Report.Report):
def insert_images(self, person): def insert_images(self, person):
photos = person.get_media_list() photos = person.get_media_list()
paragraph_started = 0
for photo in photos : for photo in photos :
object = photo.get_reference() object = photo.get_reference()
if object.get_mime_type()[0:5] == "image": if object.get_mime_type()[0:5] == "image":
file = object.get_path() file = object.get_path()
if not paragraph_started:
self.doc.start_paragraph("DAR-Entry")
paragraph_started = 1
self.doc.add_media_object(file,"row",4.0,4.0) self.doc.add_media_object(file,"row",4.0,4.0)
self.doc.end_paragraph()
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# #

13
src/plugins/DetDescendantReport.py
View File

@ -205,12 +205,12 @@ class DetDescendantReport(Report.Report):
def write_person(self, key, rptOptions): def write_person(self, key, rptOptions):
"""Output birth, death, parentage, marriage and notes information """ """Output birth, death, parentage, marriage and notes information """
self.doc.start_paragraph("DDR-First-Entry","%s." % str(key))
person = self.map[key] person = self.map[key]
if rptOptions.addImages == reportOptions.Yes: if rptOptions.addImages == reportOptions.Yes:
self.insert_images(person) self.insert_images(person)
self.doc.start_paragraph("DDR-First-Entry","%s." % str(key))
name = person.get_primary_name().get_regular_name() name = person.get_primary_name().get_regular_name()
if rptOptions.firstName == reportOptions.Yes: if rptOptions.firstName == reportOptions.Yes:
@ -530,11 +530,11 @@ class DetDescendantReport(Report.Report):
mateFirstName = mate.get_primary_name().get_first_name() mateFirstName = mate.get_primary_name().get_first_name()
if mate: if mate:
self.doc.start_paragraph("DDR-Entry")
if rptOptions.addImages == reportOptions.Yes: if rptOptions.addImages == reportOptions.Yes:
self.insert_images(mate) self.insert_images(mate)
self.doc.start_paragraph("DDR-Entry")
if rptOptions.firstName == reportOptions.No: if rptOptions.firstName == reportOptions.No:
mateFirstName = heshe mateFirstName = heshe
@ -556,16 +556,11 @@ class DetDescendantReport(Report.Report):
def insert_images(self, person): def insert_images(self, person):
photos = person.get_media_list() photos = person.get_media_list()
paragraph_started = 0
for photo in photos : for photo in photos :
object = photo.get_reference() object = photo.get_reference()
if object.get_mime_type()[0:5] == "image": if object.get_mime_type()[0:5] == "image":
file = object.get_path() file = object.get_path()
if not paragraph_started:
self.doc.start_paragraph("DDR-Entry")
paragraph_started = 1
self.doc.add_media_object(file,"row",4.0,4.0) self.doc.add_media_object(file,"row",4.0,4.0)
self.doc.end_paragraph()
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# #