FIXED : #32 : Sample_07_Chart.php : PPTX

Author: Progi1984

samples/Sample_07_Chart.php

@@ -12,6 +12,7 @@
 use PhpOffice\PhpPowerpoint\Style\Border;
 use PhpOffice\PhpPowerpoint\Style\Color;
 use PhpOffice\PhpPowerpoint\Style\Fill;
+use PhpOffice\PhpPowerpoint\Style\Shadow;
 
 // Create new PHPPowerPoint object
 echo date('H:i:s') . ' Create new PHPPowerPoint object'.EOL;
@@ -31,6 +32,13 @@
 echo date('H:i:s') . ' Remove first slide'.EOL;
 $objPHPPowerPoint->removeSlideByIndex(0);
 
+// Set Style
+$oFill = new Fill();
+$oFill->setFillType(Fill::FILL_SOLID)->setStartColor(new Color('FFE06B20'));
+
+$oShadow = new Shadow();
+$oShadow->setVisible(true)->setDirection(45)->setDistance(10);
+
 // Create templated slide
 echo date('H:i:s') . ' Create templated slide'.EOL;
 $currentSlide = createTemplatedSlide($objPHPPowerPoint);
@@ -62,13 +70,8 @@
       ->setWidth(700)
       ->setOffsetX(120)
       ->setOffsetY(80);
-$shape->getShadow()->setVisible(true)
-                   ->setDirection(45)
-                   ->setDistance(10);
-$shape->getFill()->setFillType(Fill::FILL_GRADIENT_LINEAR)
-                 ->setStartColor(new Color('FFE06B20'))
-                 ->setEndColor(new Color('FFFFFFFF'))
-                 ->setRotation(270);
+$shape->setShadow($oShadow);
+$shape->setFill($oFill);
 $shape->getBorder()->setLineStyle(Border::LINE_SINGLE);
 $shape->getTitle()->setText('PHPPowerPoint Monthly Downloads');
 $shape->getTitle()->getFont()->setItalic(true);
@@ -106,13 +109,8 @@
       ->setWidth(700)
       ->setOffsetX(120)
       ->setOffsetY(80);
-$shape->getShadow()->setVisible(true)
-                   ->setDirection(45)
-                   ->setDistance(10);
-$shape->getFill()->setFillType(Fill::FILL_GRADIENT_LINEAR)
-                 ->setStartColor(new Color('FFE06B20'))
-                 ->setEndColor(new Color('FFFFFFFF'))
-                 ->setRotation(270);
+$shape->setShadow($oShadow);
+$shape->setFill($oFill);
 $shape->getBorder()->setLineStyle(Border::LINE_SINGLE);
 $shape->getTitle()->setText('PHPPowerPoint Daily Downloads');
 $shape->getTitle()->getFont()->setItalic(true);
@@ -146,13 +144,8 @@
       ->setWidth(700)
       ->setOffsetX(120)
       ->setOffsetY(80);
-$shape->getShadow()->setVisible(true)
-                   ->setDirection(45)
-                   ->setDistance(10);
-$shape->getFill()->setFillType(Fill::FILL_GRADIENT_LINEAR)
-                 ->setStartColor(new Color('FFE06B20'))
-                 ->setEndColor(new Color('FFFFFFFF'))
-                 ->setRotation(270);
+$shape->setShadow($oShadow);
+$shape->setFill($oFill);
 $shape->getBorder()->setLineStyle(Border::LINE_SINGLE);
 $shape->getTitle()->setText('PHPPowerPoint Daily Downloads');
 $shape->getTitle()->getFont()->setItalic(true);
@@ -187,13 +180,8 @@
       ->setWidth(700)
       ->setOffsetX(120)
       ->setOffsetY(80);
-$shape->getShadow()->setVisible(true)
-                   ->setDirection(45)
-                   ->setDistance(10);
-$shape->getFill()->setFillType(Fill::FILL_GRADIENT_LINEAR)
-                 ->setStartColor(new Color('FFE06B20'))
-                 ->setEndColor(new Color('FFFFFFFF'))
-                 ->setRotation(270);
+$shape->setShadow($oShadow);
+$shape->setFill($oFill);
 $shape->getBorder()->setLineStyle(Border::LINE_SINGLE);
 $shape->getTitle()->setText('PHPPowerPoint Daily Downloads');
 $shape->getTitle()->getFont()->setItalic(true);

src/PhpPowerpoint/AbstractShape.php

@@ -18,6 +18,7 @@
 namespace PhpOffice\PhpPowerpoint;
 
 use PhpOffice\PhpPowerpoint\Shape\Hyperlink;
+use PhpOffice\PhpPowerpoint\Style\Fill;
 use PhpOffice\PhpPowerpoint\Style\Shadow;
 
 /**
@@ -307,6 +308,17 @@ public function getFill()
         return $this->fill;
     }
 
+    /**
+     * Set Fill
+     * @param \PhpOffice\PhpPowerpoint\Style\Fill $pValue
+     * @return \PhpOffice\PhpPowerpoint\AbstractShape
+     */
+    public function setFill(Fill $pValue = null)
+    {
+        $this->fill = $pValue;
+        return $this;
+    }
+
     /**
      * Get Border
      *

src/PhpPowerpoint/Writer/PowerPoint2007/Chart.php

@@ -888,7 +888,6 @@ protected function writeLayout(XMLWriter $objWriter, $subject)
         }
 
         $objWriter->endElement();
-
         $objWriter->endElement();
     }
 
@@ -1060,12 +1059,11 @@ protected function writeTypeBar3D(XMLWriter $objWriter, Bar3D $subject, $include
             $axisYData = array_values($series->getValues());
 
             // c:val
-            if (class_exists('PHPExcel_Cell')) {
-                $objWriter->startElement('c:val');
-                $coords = ($includeSheet ? 'Sheet1!$' . PHPExcel_Cell::stringFromColumnIndex($seriesIndex + 1) . '$2:$' . PHPExcel_Cell::stringFromColumnIndex($seriesIndex + 1) . '$' . (1 + count($axisYData)) : '');
-                $this->writeMultipleValuesOrReference($objWriter, $includeSheet, $axisYData, $coords);
-                $objWriter->endElement();
-            }
+            $objWriter->startElement('c:val');
+            $coords = ($includeSheet ? 'Sheet1!$' . PHPExcel_Cell::stringFromColumnIndex($seriesIndex + 1) . '$2:$' . PHPExcel_Cell::stringFromColumnIndex($seriesIndex + 1) . '$' . (1 + count($axisYData)) : '');
+            $this->writeMultipleValuesOrReference($objWriter, $includeSheet, $axisYData, $coords);
+            $objWriter->endElement();
+            
             $objWriter->endElement();
 
             ++$seriesIndex;

tests/PhpPowerpoint/Tests/AbstractShapeTest.php

@@ -48,6 +48,16 @@ public function testConstruct()
         $this->assertInstanceOf('PhpOffice\\PhpPowerpoint\\Style\\Shadow', $object->getShadow());
     }
 
+    public function testFill()
+    {
+        $object = new RichText();
+
+        $this->assertInstanceOf('PhpOffice\\PhpPowerpoint\\AbstractShape', $object->setFill());
+        $this->assertNull($object->getFill());
+        $this->assertInstanceOf('PhpOffice\\PhpPowerpoint\\AbstractShape', $object->setFill(new Fill()));
+        $this->assertInstanceOf('PhpOffice\\PhpPowerpoint\\Style\\Fill', $object->getFill());
+    }
+
     public function testHeight()
     {
         $object = new RichText();