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

8889: Complete Individual Report fails to run

Browse Source
This commit is contained in:
Paul Franklin 2015-09-12 15:44:48 -07:00
parent c36e3f4747
commit f5adb32bb6
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gramps/plugins/textreport/indivcomplete.py
View File

@ -499,9 +499,26 @@ class IndivCompleteReport(Report):
def write_images(self): def write_images(self):
media_list = self.person.get_media_list() media_list = self.person.get_media_list()
if (not self.use_images) or (len(media_list) < 2): # only show if > one if (not self.use_images) or (not media_list):
return return
i_total = 0
for media_ref in media_list:
media_handle = media_ref.get_reference_handle()
if media_handle:
media = self._db.get_object_from_handle(media_handle)
if media and media.get_mime_type():
if media.get_mime_type().startswith("image"):
i_total += 1
if i_total == 0:
return
# if there is only one image, and it is the first Gallery item, it
# will be shown up at the top, so there's no reason to show it here;
# but if there's only one image and it is not the first Gallery
# item (maybe the first is a PDF, say), then we need to show it
if ((i_total == 1) and self.mime0 and self.mime0.startswith("image")):
return
self.doc.start_table("images","IDS-GalleryTable") self.doc.start_table("images","IDS-GalleryTable")
cells = 3 # the GalleryTable has 3 cells cells = 3 # the GalleryTable has 3 cells
self.doc.start_row() self.doc.start_row()
@ -509,9 +526,10 @@ class IndivCompleteReport(Report):
self.write_paragraph(self._('Images'), style='IDS-TableTitle') self.write_paragraph(self._('Images'), style='IDS-TableTitle')
self.doc.end_cell() self.doc.end_cell()
self.doc.end_row() self.doc.end_row()
count = 0 media_count = 0
while ( count < len(media_list) ): image_count = 0
media_ref = media_list[count] while ( media_count < len(media_list) ):
media_ref = media_list[media_count]
media_handle = media_ref.get_reference_handle() media_handle = media_ref.get_reference_handle()
media = self._db.get_object_from_handle(media_handle) media = self._db.get_object_from_handle(media_handle)
if media is None: if media is None:
@ -520,20 +538,21 @@ class IndivCompleteReport(Report):
return return
mime_type = media.get_mime_type() mime_type = media.get_mime_type()
if not mime_type or not mime_type.startswith("image"): if not mime_type or not mime_type.startswith("image"):
count += 1 media_count += 1
continue continue
description = media.get_description() description = media.get_description()
if count % cells == 0: if image_count % cells == 0:
self.doc.start_row() self.doc.start_row()
self.doc.start_cell('IDS-NormalCell') self.doc.start_cell('IDS-NormalCell')
self.write_paragraph(description, style='IDS-ImageCaptionCenter') self.write_paragraph(description, style='IDS-ImageCaptionCenter')
ReportUtils.insert_image(self._db, self.doc, media_ref, self._user, ReportUtils.insert_image(self._db, self.doc, media_ref, self._user,
align='center', w_cm=5.0, h_cm=5.0) align='center', w_cm=5.0, h_cm=5.0)
self.doc.end_cell() self.doc.end_cell()
if count % cells == cells - 1: if image_count % cells == cells - 1:
self.doc.end_row() self.doc.end_row()
count += 1 media_count += 1
if count % cells != 0: image_count += 1
if image_count % cells != 0:
self.doc.end_row() self.doc.end_row()
self.doc.end_table() self.doc.end_table()
self.doc.start_paragraph('IDS-Normal') self.doc.start_paragraph('IDS-Normal')
@ -789,12 +808,13 @@ class IndivCompleteReport(Report):
media_list = self.person.get_media_list() media_list = self.person.get_media_list()
p_style = 'IDS-PersonTable2' p_style = 'IDS-PersonTable2'
self.mime0 = None
if self.use_images and len(media_list) > 0: if self.use_images and len(media_list) > 0:
media0 = media_list[0] media0 = media_list[0]
media_handle = media0.get_reference_handle() media_handle = media0.get_reference_handle()
media = self._db.get_object_from_handle(media_handle) media = self._db.get_object_from_handle(media_handle)
mime_type = media.get_mime_type() self.mime0 = media.get_mime_type()
if mime_type and mime_type.startswith("image"): if self.mime0 and self.mime0.startswith("image"):
image_filename = media_path_full(self._db, media.get_path()) image_filename = media_path_full(self._db, media.get_path())
if os.path.exists(image_filename): if os.path.exists(image_filename):
p_style = 'IDS-PersonTable' # this is tested for, also p_style = 'IDS-PersonTable' # this is tested for, also