fix formatting

This commit is contained in:
Antoine de Troostembergh 2021-02-06 21:32:30 +01:00
parent 214df1a1cb
commit 1168789e8a
5 changed files with 33 additions and 22 deletions

View File

@ -249,9 +249,20 @@ See ``Sample_40_TemplateSetComplexValue.php`` for examples.
$table->addCell(150)->addText('Cell B2'); $table->addCell(150)->addText('Cell B2');
$table->addCell(150)->addText('Cell B3'); $table->addCell(150)->addText('Cell B3');
$templateProcessor->setComplexBlock('table', $table); $templateProcessor->setComplexBlock('table', $table);
setChartValue
"""""""""""""
Replace a variable by a chart.
.. code-block:: php
$categories = array('A', 'B', 'C', 'D', 'E');
$series1 = array(1, 3, 2, 5, 4);
$chart = new Chart('doughnut', $categories, $series1);
$templateProcessor->setChartValue('myChart', $chart);
save save
""""""""" """"
Saves the loaded template within the current directory. Returns the file path. Saves the loaded template within the current directory. Returns the file path.
.. code-block:: php .. code-block:: php
@ -259,7 +270,7 @@ Saves the loaded template within the current directory. Returns the file path.
$filepath = $templateProcessor->save(); $filepath = $templateProcessor->save();
saveAs saveAs
""""""""" """"""
Saves a copy of the loaded template in the indicated path. Saves a copy of the loaded template in the indicated path.
.. code-block:: php .. code-block:: php

View File

@ -17,23 +17,23 @@ $series1 = array(1, 3, 2, 5, 4);
$series2 = array(3, 1, 7, 2, 6); $series2 = array(3, 1, 7, 2, 6);
$series3 = array(8, 3, 2, 5, 4); $series3 = array(8, 3, 2, 5, 4);
$i=0; $i = 0;
foreach ($chartTypes as $chartType) { foreach ($chartTypes as $chartType) {
$chart = new Chart($chartType, $categories, $series1); $chart = new Chart($chartType, $categories, $series1);
if (in_array($chartType, $twoSeries)) { if (in_array($chartType, $twoSeries)) {
$chart->addSeries($categories, $series2); $chart->addSeries($categories, $series2);
} }
if (in_array($chartType, $threeSeries)) { if (in_array($chartType, $threeSeries)) {
$chart->addSeries($categories, $series3); $chart->addSeries($categories, $series3);
} }
$chart->getStyle() $chart->getStyle()
->setWidth(Converter::inchToEmu(3)) ->setWidth(Converter::inchToEmu(3))
->setHeight(Converter::inchToEmu(3)); ->setHeight(Converter::inchToEmu(3));
$templateProcessor->setChart("chart{$i}", $chart); $templateProcessor->setChart("chart{$i}", $chart);
$i++; $i++;
} }
echo date('H:i:s'), ' Saving the result document...', EOL; echo date('H:i:s'), ' Saving the result document...', EOL;

View File

@ -365,12 +365,12 @@ class TemplateProcessor
$objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Element\\' . $elementName; $objectClass = 'PhpOffice\\PhpWord\\Writer\\Word2007\\Element\\' . $elementName;
// Get the next relation id // Get the next relation id
$rId= $this->getNextRelationsIndex($this->getMainPartName()); $rId = $this->getNextRelationsIndex($this->getMainPartName());
$chart->setRelationId($rId); $chart->setRelationId($rId);
// Define the chart filename // Define the chart filename
$filename = "charts/chart{$rId}.xml"; $filename = "charts/chart{$rId}.xml";
// Get the part writer // Get the part writer
$writerPart = new \PhpOffice\PhpWord\Writer\Word2007\Part\Chart(); $writerPart = new \PhpOffice\PhpWord\Writer\Word2007\Part\Chart();
$writerPart->setElement($chart); $writerPart->setElement($chart);

View File

@ -267,10 +267,10 @@ class Chart extends AbstractPart
$this->writeSeriesItem($xmlWriter, 'val', $values); $this->writeSeriesItem($xmlWriter, 'val', $values);
// check that there are colors // check that there are colors
if (is_array($colors) && count($colors)>0) { if (is_array($colors) && count($colors) > 0) {
// assign a color to each value // assign a color to each value
$valueIndex=0; $valueIndex = 0;
foreach ($values as $value) { for ($i = 1; $i < count($values); $i++) {
// check that there are still enought colors // check that there are still enought colors
$xmlWriter->startElement('c:dPt'); $xmlWriter->startElement('c:dPt');
$xmlWriter->writeElementBlock('c:idx', 'val', $valueIndex); $xmlWriter->writeElementBlock('c:idx', 'val', $valueIndex);

View File

@ -401,7 +401,7 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
return $imagePath; return $imagePath;
}, },
'documentContent' => array('path' => $imagePath, 'width' => 500, 'height' => 500), 'documentContent' => array('path' => $imagePath, 'width' => 500, 'height' => 500),
'footerValue' => array('path' => $imagePath, 'width' => 100, 'height' => 50, 'ratio' => false), 'footerValue' => array('path' => $imagePath, 'width' => 100, 'height' => 50, 'ratio' => false),
); );
$templateProcessor->setImageValue(array_keys($variablesReplace), $variablesReplace); $templateProcessor->setImageValue(array_keys($variablesReplace), $variablesReplace);