Merge branch 'develop' into issue255

Conflicts:
	CHANGELOG.md
	docs/shapes_chart.rst
	samples/Sample_05_Chart_Line.php
	src/PhpPresentation/Shape/Chart/Axis.php
	src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php

Author: Progi1984

CHANGELOG.md

@@ -3,11 +3,21 @@
 ## 0.8.0 - WIP
 
 ### Bugfix
-
-### Changes
+- PowerPoint2007 Writer : Fixed the marker on line chart when symbol is none - @Napryc GH-211
+- PowerPoint2007 Writer : Fixed the format value in Pie Chart - @Napryc GH-212
+- PowerPoint2007 Writer : The presentation need repairs on Mac @jrking4 GH-266 GH-276
+- PowerPoint2007 Writer : Fix for PowerPoint2007 Writer (Need repair) @Progi1984 GH-266 GH-274 GH-276 GH-282 GH-302
+- PowerPoint2007 Writer : Fixed the axis title in bar chart - @pgee70 GH-267
+- PowerPoint2007 Writer : Fixed the label position in bar chart - @pgee70 GH-268
+- PowerPoint2007 Writer : Support of margins in cell in table - @carlosafonso @Progi1984 GH-273 GH-315
 
 ### Features
+- ODPresentation Writer : Show/Hide Value / Name / Series Name in Chart - @Progi1984 GH-272
+- ODPresentation Writer : Axis Bounds in Chart - @Progi1984 GH-269
+- PowerPoint2007 Writer : Implement character spacing - @jvanoostrom GH-301
+- PowerPoint2007 Writer : Axis Bounds in Chart - @Progi1984 GH-269
 - PowerPoint2007 Writer : Add support for Outline in Axis - @Progi1984 GH-255
+- Misc : Added two methods for setting Border & Fill in Legend - @Progi1984 GH-265
 
 ## 0.7.0 - 2016-09-12
 

README.md

@@ -45,6 +45,7 @@ PHPPresentation requires the following:
 - [Zip extension](http://php.net/manual/en/book.zip.php)
 - [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
 - [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php) (optional, used to write DOCX and ODT)
+- [GD](http://php.net/manual/en/book.image.php)
 
 ### Installation
 

composer.json

@@ -27,6 +27,7 @@
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "phpdocumentor/phpdocumentor":"2.*",
+        "twig/twig":"1.27",
         "phpmd/phpmd": "2.*",
         "sebastian/phpcpd": "2.*",
         "phploc/phploc": "2.*",

docs/readers.rst

@@ -10,8 +10,8 @@ The name of the reader is ``ODPresentation``.
 
 .. code-block:: php
 
-    $oWriter = IOFactory::createReader('ODPresentation');
-    $oWriter->load(__DIR__ . '/sample.odp');
+    $oReader = IOFactory::createReader('ODPresentation');
+    $oReader->load(__DIR__ . '/sample.odp');
 
 PowerPoint97
 ------------
@@ -20,8 +20,8 @@ The name of the reader is ``PowerPoint97``.
 
 .. code-block:: php
 
-    $oWriter = IOFactory::createReader('PowerPoint97');
-    $oWriter->load(__DIR__ . '/sample.ppt');
+    $oReader = IOFactory::createReader('PowerPoint97');
+    $oReader->load(__DIR__ . '/sample.ppt');
 
 PowerPoint2007
 --------------
@@ -30,8 +30,8 @@ The name of the reader is ``PowerPoint2007``.
 
 .. code-block:: php
 
-    $oWriter = IOFactory::createReader('PowerPoint2007');
-    $oWriter->load(__DIR__ . '/sample.pptx');
+    $oReader = IOFactory::createReader('PowerPoint2007');
+    $oReader->load(__DIR__ . '/sample.pptx');
 
 Serialized
 ----------
@@ -40,5 +40,5 @@ The name of the reader is ``Serialized``.
 
 .. code-block:: php
 
-    $oWriter = IOFactory::createReader('Serialized');
-    $oWriter->load(__DIR__ . '/sample.phppt');
+    $oReader = IOFactory::createReader('Serialized');
+    $oReader->load(__DIR__ . '/sample.phppt');

docs/shapes_chart.rst

@@ -34,6 +34,20 @@ For each gridline, you can custom the width (in points), the fill type and the f
     $oShape->getPlotArea()->setType($oLine);
     $oShape->getPlotArea()->getAxisX()->setMajorGridlines($oGridLines);
 
+For Axis, you can define the min & max bounds with `setMinBounds` & `setMaxBounds` methods.
+For resetting them, you pass null as parameter to these methods.
+
+.. code-block:: php
+
+    use \PhpOffice\PhpPresentation\Shape\Chart\Gridlines;
+
+    $oLine = new Line();
+
+    $oShape = $oSlide->createChartShape();
+    $oShape->getPlotArea()->setType($oLine);
+    $oShape->getPlotArea()->getAxisX()->setMinBounds(0);
+    $oShape->getPlotArea()->getAxisX()->setMaxBounds(200);
+
 You can define outline for each axis (X & Y).
 
 .. code-block:: php

docs/shapes_table.rst

@@ -36,7 +36,7 @@ You can access cell objects with `nextCell` method of a Row object.
 	// Get the second cell
 	$cellA2 = $row->nextCell();
 	
-You can access cell object directly
+You can access cell object directly.
 
 .. code-block:: php
 
@@ -46,7 +46,25 @@ You can access cell object directly
 	$cellA1 = $row->getCell(0);
 	// Get the second cell
 	$cellA2 = $row->getCell(1);
-	
+
+
+Define margins of a cell
+~~~~~~~~~~~~~~~~~~~~~~~~
+Margins of cells are defined by margins of the first paragraph of cell.
+
+For defining margins of cell, you can use the `setMargin*` method of a Alignment object of the active paragraph of a Cell object.
+
+.. code-block:: php
+
+	$tableShape = $slide->createTableShape($columns);
+	$row = $tableShape->createRow();
+	$cellA1 = $row->nextCell();
+	$cellA1->getActiveParagraph()->getAlignment()
+	    ->setMarginBottom(20)
+	    ->setMarginLeft(40)
+	    ->setMarginRight(60)
+	    ->setMarginTop(80);
+
 
 Define the width of a cell
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

phpmd.xml.dist

@@ -20,7 +20,7 @@
         <!-- PptSlides needs more coupling (default: 13) -->
         <!-- Writer/Office2007/AbstractSlide needs more coupling (default: 13) -->
 		<properties>
-            <property name="minimum" value="31" />
+            <property name="minimum" value="32" />
         </properties>
     </rule>
     <rule ref="rulesets/design.xml/NumberOfChildren">

samples/Sample_04_Table.php

@@ -50,6 +50,8 @@
 $cell->getBorders()->getBottom()->setLineWidth(4)
                                 ->setLineStyle(Border::LINE_SINGLE)
                                 ->setDashStyle(Border::DASH_DASH);
+$cell->getActiveParagraph()->getAlignment()
+	->setMarginLeft(10);
 
 // Add row
 echo date('H:i:s') . ' Add row'.EOL;
@@ -60,6 +62,7 @@
                ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFFFFFFF'));
 $row->nextCell()->createTextRun('R1C1')->getFont()->setBold(true);
+$row->getCell()->getActiveParagraph()->getAlignment()->setMarginLeft(20);
 $row->nextCell()->createTextRun('R1C2')->getFont()->setBold(true);
 $row->nextCell()->createTextRun('R1C3')->getFont()->setBold(true);
 
@@ -76,6 +79,7 @@
 			   ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFE06B20'));
 $row->nextCell()->createTextRun('R2C1');
+$row->getCell()->getActiveParagraph()->getAlignment()->setMarginLeft(30);
 $row->nextCell()->createTextRun('R2C2');
 $row->nextCell()->createTextRun('R2C3');
 
@@ -86,6 +90,7 @@
 			   ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFE06B20'));
 $row->nextCell()->createTextRun('R3C1');
+$row->getCell()->getActiveParagraph()->getAlignment()->setMarginLeft(40);
 $row->nextCell()->createTextRun('R3C2');
 $row->nextCell()->createTextRun('R3C3');
 
@@ -98,6 +103,7 @@
 $cellC1 = $row->nextCell();
 $textRunC1 = $cellC1->createTextRun('Link');
 $textRunC1->getHyperlink()->setUrl('https://github.com/PHPOffice/PHPPresentation/')->setTooltip('PHPPresentation');
+$cellC1->getActiveParagraph()->getAlignment()->setMarginLeft(50);
 $cellC2 = $row->nextCell();
 $textRunC2 = $cellC2->createTextRun('RichText with');
 $textRunC2->getFont()->setBold(true);

samples/Sample_05_Chart.php

@@ -16,12 +16,11 @@
 use PhpOffice\PhpPresentation\Style\Color;
 use PhpOffice\PhpPresentation\Style\Fill;
 use PhpOffice\PhpPresentation\Style\Shadow;
-use PhpOffice\PhpPresentation\Style\PhpOffice\PhpPresentation\Style;
 
 function fnSlide_Area(PhpPresentation $objPHPPresentation) {
     global $oFill;
     global $oShadow;
-    
+
     // Generate sample data for chart
     echo date('H:i:s') . ' Generate sample data for chart' . EOL;
     $seriesData = array(
@@ -33,11 +32,11 @@ function fnSlide_Area(PhpPresentation $objPHPPresentation) {
         'Saturday' => 9,
         'Sunday' => 7
     );
-    
+
     // Create templated slide
     echo EOL . date('H:i:s') . ' Create templated slide' . EOL;
     $currentSlide = createTemplatedSlide($objPHPPresentation);
-    
+
     // Create a line chart (that should be inserted in a shape)
     echo date('H:i:s') . ' Create a area chart (that should be inserted in a chart shape)' . EOL;
     $areaChart = new Area();
@@ -47,7 +46,7 @@ function fnSlide_Area(PhpPresentation $objPHPPresentation) {
     $series->getFill()->setStartColor(new Color('FF93A9CE'));
     $series->setLabelPosition(Series::LABEL_INSIDEEND);
     $areaChart->addSeries($series);
-    
+
     // Create a shape (chart)
     echo date('H:i:s') . ' Create a shape (chart)' . EOL;
     $shape = $currentSlide->createChartShape();
@@ -59,6 +58,8 @@ function fnSlide_Area(PhpPresentation $objPHPPresentation) {
     $shape->getTitle()->setText('PHPPresentation Daily Downloads');
     $shape->getTitle()->getFont()->setItalic(true);
     $shape->getPlotArea()->setType($areaChart);
+    $shape->getPlotArea()->getAxisX()->setTitle('Axis X');
+    $shape->getPlotArea()->getAxisY()->setTitle('Axis Y');
     $shape->getView3D()->setRotationX(30);
     $shape->getView3D()->setPerspective(30);
     $shape->getLegend()->getBorder()->setLineStyle(Border::LINE_SINGLE);
@@ -90,6 +91,7 @@ function fnSlide_Bar(PhpPresentation $objPHPPresentation) {
     $series2->setShowSeriesName(true);
     $series2->getFont()->getColor()->setRGB('FF0000');
     $series2->getFill()->setFillType(Fill::FILL_SOLID)->setStartColor(new Color('FFC0504D'));
+    $series2->setLabelPosition(Series::LABEL_INSIDEEND);
     $barChart->addSeries($series1);
     $barChart->addSeries($series2);
 
@@ -457,6 +459,7 @@ function fnSlide_Pie(PhpPresentation $objPHPPresentation) {
     $series->setShowValue( false );
     $series->setShowSeriesName( false );
     $series->setShowCategoryName( true );
+    $series->setDlblNumFormat('%d');
     $pieChart->addSeries($series);
 
     // Create a shape (chart)

samples/Sample_05_Chart_Line.php

@@ -3,12 +3,8 @@
 include_once 'Sample_Header.php';
 
 use PhpOffice\PhpPresentation\PhpPresentation;
-use PhpOffice\PhpPresentation\Shape\Chart\Type\Bar3D;
 use PhpOffice\PhpPresentation\Shape\Chart\Type\Line;
-use PhpOffice\PhpPresentation\Shape\Chart\Type\Pie3D;
-use PhpOffice\PhpPresentation\Shape\Chart\Type\Scatter;
 use PhpOffice\PhpPresentation\Shape\Chart\Series;
-use PhpOffice\PhpPresentation\Style\Alignment;
 use PhpOffice\PhpPresentation\Style\Border;
 use PhpOffice\PhpPresentation\Style\Color;
 use PhpOffice\PhpPresentation\Style\Fill;
@@ -181,7 +177,17 @@
 $shape4->getPlotArea()->getAxisY()->setOutline($oOutlineAxisY);
 $currentSlide->addShape($shape4);
 
+// Create templated slide
+echo EOL . date('H:i:s') . ' Create templated slide' . EOL;
+$currentSlide = createTemplatedSlide($objPHPPresentation);
 
+// Create a shape (chart)
+echo date('H:i:s') . ' Create a shape (chart5)' . EOL;
+echo date('H:i:s') . ' Feature : Gridlines' . EOL;
+$shape5 = clone $shape;
+$shape5->getPlotArea()->getAxisY()->setMinBounds(5);
+$shape5->getPlotArea()->getAxisY()->setMaxBounds(20);
+$currentSlide->addShape($shape5);
 // Save file
 echo EOL . write($objPHPPresentation, basename(__FILE__, '.php'), $writers);