dabo Commit
Revision 4037
Date: 2008-04-14 13:00:20 -0700 (Mon, 14 Apr 2008)
Author: Paul
Trac: http://svn.dabodev.com/trac/dabo/changeset/4037
Changed:
U trunk/dabo/lib/reportWriter.py
Log:
Previously, the Image expression would only allow filenames or paths.
Now, it can be a buffer which the report writer will convert into the
proper image for reportlab. This is handy for images kept in databases,
for example.
Note: I couldn't do this without saving temp files to disk, because
of bugs in some versions of reportlab. But at least the appdev
doesn't need to worry about it.
Index: dabo/lib/reportWriter.py
===================================================================
--- dabo/lib/reportWriter.py (revision 4035)
+++ dabo/lib/reportWriter.py (working copy)
@@ -44,6 +44,7 @@
del(_failedLibs)
#######################################################
+import cStringIO
import reportlab.pdfgen.canvas as canvas
import reportlab.graphics.shapes as shapes
import reportlab.lib.pagesizes as pagesizes
@@ -56,8 +57,8 @@
from dabo.dLocalize import _
from dabo.lib.caselessDict import CaselessDict
from reportlab.lib.utils import ImageReader
-from StringIO import StringIO
from PIL import Image as PILImage
+import reportUtils
# The below block tried to use the experimental para.Paragraph which
# handles more html tags, including hyperlinks. However, I couldn't
@@ -1117,20 +1118,33 @@
p.rect(-1, -1, width+2, height+2)
c.clipPath(p, stroke=stroke)
- imageFile = obj.getProp("expr")
- if imageFile and not os.path.exists(imageFile):
- imageFile = os.path.join(self.HomeDirectory,
imageFile)
- if imageFile:
- imageFile = str(imageFile)
+ img = obj.getProp("expr")
+ if isinstance(img, basestring) and "\0" not in img:
+ # this is a path to image file, not the image
itself
+ if not os.path.exists(img):
+ img = os.path.join(self.HomeDirectory,
img)
+ else:
+ # convert stream to PIL image:
+ #buffer = cStringIO.StringIO()
+ #buffer.write(img)
+ #buffer.seek(0)
+ #img = PILImage.open(buffer)
+ # (pkm: the above doesn't work in all reportlab
versions. Safer to save a
+ # temp file unfortunately.)
+ imageFileName =
reportUtils.getTempFile(ext="png")
+ imageFile = open(imageFileName, "wb")
+ imageFile.write(img)
+ imageFile.close()
+ img = imageFileName
- if imageFile and mode == "clip":
+ if mode == "clip":
# Need to set w,h to None for the drawImage,
which will draw it in its
# "natural" state 1:1 pixel:point, which could
flow out of the object's
# width/height, resulting in clipping.
width, height = None, None
- if imageFile:
- c.drawImage(imageFile, 0, 0, width, height,
mask)
+ if img:
+ c.drawImage(img, 0, 0, width, height, mask)
elif objType == "BarGraph":
# Do these imports here so as not to require the huge
matplotlib unless
Diff:
Modified: trunk/dabo/lib/reportWriter.py
===================================================================
--- trunk/dabo/lib/reportWriter.py 2008-04-14 18:21:01 UTC (rev 4036)
+++ trunk/dabo/lib/reportWriter.py 2008-04-14 20:00:20 UTC (rev 4037)
@@ -44,6 +44,7 @@
del(_failedLibs)
#######################################################
+import cStringIO
import reportlab.pdfgen.canvas as canvas
import reportlab.graphics.shapes as shapes
import reportlab.lib.pagesizes as pagesizes
@@ -56,8 +57,8 @@
from dabo.dLocalize import _
from dabo.lib.caselessDict import CaselessDict
from reportlab.lib.utils import ImageReader
-from StringIO import StringIO
from PIL import Image as PILImage
+import reportUtils
# The below block tried to use the experimental para.Paragraph which
# handles more html tags, including hyperlinks. However, I couldn't
@@ -1117,20 +1118,33 @@
p.rect(-1, -1, width+2, height+2)
c.clipPath(p, stroke=stroke)
- imageFile = obj.getProp("expr")
- if imageFile and not os.path.exists(imageFile):
- imageFile = os.path.join(self.HomeDirectory,
imageFile)
- if imageFile:
- imageFile = str(imageFile)
+ img = obj.getProp("expr")
+ if isinstance(img, basestring) and "\0" not in img:
+ # this is a path to image file, not the image
itself
+ if not os.path.exists(img):
+ img = os.path.join(self.HomeDirectory,
img)
+ else:
+ # convert stream to PIL image:
+ #buffer = cStringIO.StringIO()
+ #buffer.write(img)
+ #buffer.seek(0)
+ #img = PILImage.open(buffer)
+ # (pkm: the above doesn't work in all reportlab
versions. Safer to save a
+ # temp file unfortunately.)
+ imageFileName =
reportUtils.getTempFile(ext="png")
+ imageFile = open(imageFileName, "wb")
+ imageFile.write(img)
+ imageFile.close()
+ img = imageFileName
- if imageFile and mode == "clip":
+ if mode == "clip":
# Need to set w,h to None for the drawImage,
which will draw it in its
# "natural" state 1:1 pixel:point, which could
flow out of the object's
# width/height, resulting in clipping.
width, height = None, None
- if imageFile:
- c.drawImage(imageFile, 0, 0, width, height,
mask)
+ if img:
+ c.drawImage(img, 0, 0, width, height, mask)
elif objType == "BarGraph":
# Do these imports here so as not to require the huge
matplotlib unless
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message: http://leafe.com/archives/byMID/[EMAIL PROTECTED]
