Discussion:
[22909] standard/trunk/library/Zend/Pdf: Zend_Pdf: canvases support implementation update.
alexander
2010-08-27 19:57:49 UTC
Permalink
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22909] standard/trunk/library/Zend/Pdf: Zend_Pdf: canvases support implementation update.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22909</dd>
<dt>Author</dt> <dd>alexander</dd>
<dt>Date</dt> <dd>2010-08-27 12:57:48 -0700 (Fri, 27 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Zend_Pdf: canvases support implementation update. Still needs content stream parser. [ZF-2139].</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#standardtrunklibraryZendPdfCanvasAbstractphp">standard/trunk/library/Zend/Pdf/Canvas/Abstract.php</a></li>
<li><a href="#standardtrunklibraryZendPdfCanvasInterfacephp">standard/trunk/library/Zend/Pdf/Canvas/Interface.php</a></li>
<li><a href="#standardtrunklibraryZendPdfCanvasphp">standard/trunk/library/Zend/Pdf/Canvas.php</a></li>
<li><a href="#standardtrunklibraryZendPdfElementObjectStreamphp">standard/trunk/library/Zend/Pdf/Element/Object/Stream.php</a></li>
<li><a href="#standardtrunklibraryZendPdfPagephp">standard/trunk/library/Zend/Pdf/Page.php</a></li>
<li><a href="#standardtrunklibraryZendPdfResourceGraphicsStatephp">standard/trunk/library/Zend/Pdf/Resource/GraphicsState.php</a></li>
<li><a href="#standardtrunklibraryZendPdfResourcephp">standard/trunk/library/Zend/Pdf/Resource.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#standardtrunklibraryZendPdfResourceContentStreamphp">standard/trunk/library/Zend/Pdf/Resource/ContentStream.php</a></li>
<li><a href="#standardtrunklibraryZendPdfResourceUnifiedphp">standard/trunk/library/Zend/Pdf/Resource/Unified.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardtrunklibraryZendPdfCanvasAbstractphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Pdf/Canvas/Abstract.php (22908 => 22909)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Pdf/Canvas/Abstract.php 2010-08-25 20:52:47 UTC (rev 22908)
+++ standard/trunk/library/Zend/Pdf/Canvas/Abstract.php 2010-08-27 19:57:48 UTC (rev 22909)
</span><span class="lines">@@ -92,7 +92,8 @@
</span><span class="cx"> *
</span><span class="cx"> * Method returns a name of the resource which can be used
</span><span class="cx"> * as a resource reference within drawing instructions stream
</span><del>- * Allowed types: 'XObject' (image), 'Font', 'ExtGState'
</del><ins>+ * Allowed types: 'ExtGState', 'ColorSpace', 'Pattern', 'Shading',
+ * 'XObject', 'Font', 'Properties' </ins><span class="cx"> * </span><span class="cx"> * @param string $type </span><span class="cx"> * @param Zend_Pdf_Resource $resource </span><span class="lines">@@ -113,9 +114,46 @@ </span><span class="cx"> * @param float $y2 </span><span class="cx"> * @return Zend_Pdf_Canvas_Interface </span><span class="cx"> */ </span><del>- public function drawCanvas($canvas, $x1, $y1, $x2 = null, $y2 = null) </del><ins>+ public function drawCanvas(Zend_Pdf_Canvas_Interface $canvas, $x1, $y1, $x2 = null, $y2 = null) </ins><span class="cx"> { </span><del>- /** @todo implementation */ </del><ins>+ $this-&gt;saveGS();
+
+ $this-&gt;translate($x1, $y1);
+
+ if ($x2 === null) {
+ $with = $canvas-&gt;getWidth();
+ } else {
+ $with = $x2 - $x1;
+ }
+ if ($y2 === null) {
+ $height = $canvas-&gt;getHeight();
+ } else {
+ $height = $y2 - $y1;
+ }
+
+ $this-&gt;clipRectangle(0, 0, $with, $height);
+
+ if ($x2 !== null || $y2 !== null) {
+ // Drawn canvas has to be scaled.
+ if ($x2 !== null) {
+ $xScale = $with/$canvas-&gt;getWidth();
+ } else {
+ $xScale = 1;
+ }
+
+ if ($y2 !== null) {
+ $yScale = $height/$canvas-&gt;getHeight();
+ } else {
+ $yScale = 1;
+ }
+
+ $this-&gt;scale($xScale, $yScale);
+ }
+
+ $contentsToDraw = $canvas-&gt;_getContents();
+
+ $this-&gt;restoreGS();
+
</ins><span class="cx"> return $this;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="standardtrunklibraryZendPdfCanvasInterfacephp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Pdf/Canvas/Interface.php (22908 => 22909)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Pdf/Canvas/Interface.php 2010-08-25 20:52:47 UTC (rev 22908)
+++ standard/trunk/library/Zend/Pdf/Canvas/Interface.php 2010-08-27 19:57:48 UTC (rev 22909)
</span><span class="lines">@@ -30,8 +30,48 @@
</span><span class="cx"> */
</span><span class="cx"> interface Zend_Pdf_Canvas_Interface
</span><span class="cx"> {
</span><ins>+ /**
+ * Returns dictionaries of used resources.
+ *
+ * Used for canvas implementations interoperability
+ *
+ * Structure of the returned array:
+ * array(
+ * &lt;resTypeName&gt; =&gt; array(
+ * &lt;resName&gt; =&gt; &lt;Zend_Pdf_Resource object&gt;,
+ * &lt;resName&gt; =&gt; &lt;Zend_Pdf_Resource object&gt;,
+ * &lt;resName&gt; =&gt; &lt;Zend_Pdf_Resource object&gt;,
+ * ...
+ * ),
+ * &lt;resTypeName&gt; =&gt; array(
+ * &lt;resName&gt; =&gt; &lt;Zend_Pdf_Resource object&gt;,
+ * &lt;resName&gt; =&gt; &lt;Zend_Pdf_Resource object&gt;,
+ * &lt;resName&gt; =&gt; &lt;Zend_Pdf_Resource object&gt;,
+ * ...
+ * ),
+ * ...
+ * 'ProcSet' =&gt; array()
+ * )
+ *
+ * where ProcSet array is a list of used procedure sets names (strings).
+ * Allowed procedure set names: 'PDF', 'Text', 'ImageB', 'ImageC', 'ImageI'
+ *
+ * @internal
+ * @return array
+ */
+ public function getResources();
</ins><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get drawing instructions stream
+ *
+ * It has to be returned as a PDF stream object to make it reusable.
+ *
+ * @internal
+ * @returns Zend_Pdf_Resource_ContentStream
+ */
+ public function getContents();
+
+ /**
</ins><span class="cx"> * Return canvas height.
</span><span class="cx"> *
</span><span class="cx"> * @return float
</span><span class="lines">@@ -58,7 +98,7 @@
</span><span class="cx"> * @param float $y2
</span><span class="cx"> * @return Zend_Pdf_Canvas_Interface
</span><span class="cx"> */
</span><del>- public function drawCanvas($canvas, $x1, $y1, $x2 = null, $y2 = null);
</del><ins>+ public function drawCanvas(Zend_Pdf_Canvas_Interface $canvas, $x1, $y1, $x2 = null, $y2 = null);
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Set fill color.
</span></span></pre></div>
<a id="standardtrunklibraryZendPdfCanvasphp"></a>
<div class="modfile"><h4>Modified: standard/trunk/library/Zend/Pdf/Canvas.php (22908 => 22909)</h4>
<pre class="diff"><span>
<span class="info">--- standard/trunk/library/Zend/Pdf/Canvas.php 2010-08-25 20:52:47 UTC (rev 22908)
+++ standard/trunk/library/Zend/Pdf/Canvas.php 2010-08-27 19:57:48 UTC (rev 22909)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Canvas procedure sets.
</span><span class="cx"> *
</span><ins>+ * Allowed values: 'PDF', 'Text', 'ImageB', 'ImageC', 'ImageI'.
+ *
</ins><span class="cx"> * @var array
</span><span class="cx"> */
</span><span class="cx"> protected $_procSet = array();
</span><span class="lines">@@ -83,7 +85,8 @@
</span><span class="cx"> *
</span><span class="cx"> * Method returns a name of the resource which can be used
</span><span class="cx"> * as a resource reference within drawing instructions stream
</span><del>- * Allowed types: 'XObject' (image), 'Font', 'ExtGState'
</del><ins>+ * Allowed types: 'ExtGState', 'ColorSpace', 'Pattern', 'Shading',
+ * 'XObject', 'Font', 'Properties'
</ins><span class="lines">@@ Diff output truncated at 4096 characters. @@
</span></span></pre>
</div>
</div>

</body>
</html>

Loading...