Merge branch 'develop' into issue255

Author: Progi1984

CHANGELOG.md

@@ -12,6 +12,9 @@
 - PowerPoint2007 Writer : Support of margins in cell in table - @carlosafonso @Progi1984 GH-273 GH-315
 - Fixed the corruption of file when an addExternalSlide is called - @Progi1984 GH-240
 
+### Changes
+- Misc : Added two methods for setting Border & Fill in Legend - @Progi1984 GH-265
+
 ### Features
 - ODPresentation Writer : Show/Hide Value / Name / Series Name in Chart - @Progi1984 GH-272
 - ODPresentation Writer : Axis Bounds in Chart - @Progi1984 GH-269
@@ -26,7 +29,7 @@
 - PowerPoint2007 Writer : Support tick mark & unit in Axis for Chart - @Faab GH-218
 - PowerPoint2007 Writer : Support separator in Series for Chart - @jphchaput GH-218
 - PowerPoint2007 Writer : Add support for Outline in Axis - @Progi1984 GH-255
-- Misc : Added two methods for setting Border & Fill in Legend - @Progi1984 GH-265
+- PowerPoint2007 Writer : Support autoscale for Chart - @Progi1984 GH-293
 
 ## 0.7.0 - 2016-09-12
 

docs/shapes_chart.rst

@@ -156,6 +156,15 @@ You can define if some informations are displayed.
     $oSeries->setShowSeriesName(true);
     $oSeries->setShowValue(true);
 
+View3D
+^^^^^^
+
+For enabling the autoscale for a shape, you must reset the height percent.
+
+.. code-block:: php
+
+    $oShape->getView3D()->setHeightPercent(null);
+
 Types
 -----
 

src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php

@@ -97,16 +97,15 @@ public function writeChart(Chart $chart)
         $objWriter->writeAttribute('val', $chart->getView3D()->getRotationX());
         $objWriter->endElement();
 
-        // c:hPercent
-        $objWriter->startElement('c:hPercent');
-        $objWriter->writeAttribute('val', $chart->getView3D()->getHeightPercent());
-        $objWriter->endElement();
-
         // c:rotY
         $objWriter->startElement('c:rotY');
         $objWriter->writeAttribute('val', $chart->getView3D()->getRotationY());
         $objWriter->endElement();
 
+        // c:hPercent
+        $hPercent = $chart->getView3D()->getHeightPercent();
+        $objWriter->writeElementIf($hPercent != null, 'c:hPercent', 'val', $hPercent);
+
         // c:depthPercent
         $objWriter->startElement('c:depthPercent');
         $objWriter->writeAttribute('val', $chart->getView3D()->getDepthPercent());

tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php

@@ -880,4 +880,22 @@ public function testTypeScatterSuperScript()
         $this->assertZipXmlElementExists('ppt/charts/' . $oShape->getIndexedFilename(), $element);
         $this->assertZipXmlAttributeEquals('ppt/charts/' . $oShape->getIndexedFilename(), $element, 'baseline', '30000');
     }
+
+    public function testView3D()
+    {
+        $oSlide = $this->oPresentation->getActiveSlide();
+        $oLine = new Line();
+        $oLine->addSeries(new Series('Downloads', $this->seriesData));
+        $oShape = $oSlide->createChartShape();
+        $oShape->getPlotArea()->setType($oLine);
+
+        $element = '/c:chartSpace/c:chart/c:view3D/c:hPercent';
+        $this->assertZipXmlElementExists('ppt/charts/' . $oShape->getIndexedFilename(), $element);
+        $this->assertZipXmlAttributeEquals('ppt/charts/' . $oShape->getIndexedFilename(), $element, 'val', 100);
+
+        $oShape->getView3D()->setHeightPercent(null);
+        $this->resetPresentationFile();
+
+        $this->assertZipXmlElementNotExists('ppt/charts/' . $oShape->getIndexedFilename(), $element);
+    }
 }