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

0001945: Book report, title page, adding a image - do not work when output is ODF

Browse Source 
svn: r10493
This commit is contained in:
Brian Matherly 2008-04-06 03:41:22 +00:00
parent 06cf9ea0fd
commit a79a82faf5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/docgen/ODFDoc.py
View File

@ -28,6 +28,7 @@
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import os import os
import md5
import zipfile import zipfile
import time import time
import locale import locale
@ -434,11 +435,11 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
app = Mime.get_application(_apptype) app = Mime.get_application(_apptype)
Utils.launch(app[0], self.filename) Utils.launch(app[0], self.filename)
def add_media_object(self, name, pos, x_cm, y_cm): def add_media_object(self, file_name, pos, x_cm, y_cm):
# try to open the image. If the open fails, it probably wasn't # try to open the image. If the open fails, it probably wasn't
# a valid image (could be a PDF, or a non-image) # a valid image (could be a PDF, or a non-image)
(x, y) = ImgManip.image_size(name) (x, y) = ImgManip.image_size(file_name)
if (x, y) == (0, 0): if (x, y) == (0, 0):
return return
@ -450,11 +451,14 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
act_height = y_cm act_height = y_cm
act_width = x_cm/ratio act_width = x_cm/ratio
media_list_item = (name, act_width, act_height) not_extension, extension = os.path.splitext(file_name)
odf_name = md5.new(file_name).hexdigest() + extension
media_list_item = (file_name, odf_name)
if not media_list_item in self.media_list: if not media_list_item in self.media_list:
self.media_list.append(media_list_item) self.media_list.append(media_list_item)
base = escape(os.path.basename(name)) base = escape(os.path.basename(file_name))
tag = base.replace('.', '_') tag = base.replace('.', '_')
if self.new_cell: if self.new_cell:
@ -474,7 +478,7 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
self.cntnt.write('svg:height="%.2fcm" ' % act_height) self.cntnt.write('svg:height="%.2fcm" ' % act_height)
self.cntnt.write('draw:z-index="1" >') self.cntnt.write('draw:z-index="1" >')
self.cntnt.write('<draw:image xlink:href="Pictures/') self.cntnt.write('<draw:image xlink:href="Pictures/')
self.cntnt.write(base) self.cntnt.write(odf_name)
self.cntnt.write('" xlink:type="simple" xlink:show="embed" ') self.cntnt.write('" xlink:type="simple" xlink:show="embed" ')
self.cntnt.write('xlink:actuate="onLoad"/>\n') self.cntnt.write('xlink:actuate="onLoad"/>\n')
self.cntnt.write('</draw:frame>\n') self.cntnt.write('</draw:frame>\n')
@ -559,8 +563,7 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
for image in self.media_list: for image in self.media_list:
try: try:
ifile = open(image[0], mode='rb') ifile = open(image[0], mode='rb')
base = os.path.basename(image[0]) self._add_zip(zfile, "Pictures/%s" % image[1], ifile.read(), t)
self._add_zip(zfile, "Pictures/%s" % base, ifile.read(), t)
ifile.close() ifile.close()
except: except:
print "Could not open %s" % image[0] print "Could not open %s" % image[0]
@ -903,11 +906,9 @@ class ODFDoc(BaseDoc.BaseDoc, BaseDoc.TextDoc, BaseDoc.DrawDoc):
self.mfile.write('manifest:media-type="%s" ' % _apptype) self.mfile.write('manifest:media-type="%s" ' % _apptype)
self.mfile.write('manifest:full-path="/"/>') self.mfile.write('manifest:full-path="/"/>')
for image in self.media_list: for image in self.media_list:
i = image[0]
base = escape(os.path.basename(i))
self.mfile.write('<manifest:file-entry manifest:media-type="" ') self.mfile.write('<manifest:file-entry manifest:media-type="" ')
self.mfile.write('manifest:full-path="Pictures/') self.mfile.write('manifest:full-path="Pictures/')
self.mfile.write(base) self.mfile.write(image[1])
self.mfile.write('"/>') self.mfile.write('"/>')
self.mfile.write('<manifest:file-entry manifest:media-type="" ') self.mfile.write('<manifest:file-entry manifest:media-type="" ')
self.mfile.write('manifest:full-path="Pictures/"/>') self.mfile.write('manifest:full-path="Pictures/"/>')