#161 : Improvements (Reading & Writing Background & some Styles)

Author: Progi1984

samples/Sample_19_SlideMaster.php

@@ -15,9 +15,9 @@
 echo date('H:i:s') . ' Set properties' . EOL;
 $objPHPPresentation->getDocumentProperties()->setCreator('PHPOffice')
     ->setLastModifiedBy('PHPPresentation Team')
-    ->setTitle('Sample 01 SlideMaster')
-    ->setSubject('Sample 01 Subject')
-    ->setDescription('Sample 01 Description')
+    ->setTitle('Sample 19 SlideMaster')
+    ->setSubject('Sample 19 Subject')
+    ->setDescription('Sample 19 Description')
     ->setKeywords('office 2007 openxml libreoffice odt php')
     ->setCategory('Sample Category');
 
@@ -84,7 +84,7 @@
     ->setDistance(10);
 $shape->getHyperlink()->setUrl('https://github.com/PHPOffice/PHPPresentation/')->setTooltip('PHPPresentation');
 
-// Create a shape (text)
+// Create a shape (text) linked to a PlaceHolder
 echo date('H:i:s') . ' Create a shape (rich text)' . EOL;
 $shape = $currentSlide->createRichTextShape()->setWidthAndHeight(960, 80)->setOffsetX(0)->setOffsetY(60);
 $shape->getFill()->setFillType(Fill::FILL_SOLID)->setStartColor(new Color(Color::COLOR_BLUE));

src/PhpPresentation/PhpPresentation.php

@@ -72,6 +72,9 @@ class PhpPresentation
      */
     public function __construct()
     {
+        // Set empty Master & SlideLayout
+        $this->createMasterSlide()->createSlideLayout();
+
         // Initialise slide collection and add one slide
         $this->createSlide();
         $this->setActiveSlideIndex();
@@ -80,9 +83,6 @@ public function __construct()
         $this->setDocumentProperties(new DocumentProperties());
         $this->setPresentationProperties(new PresentationProperties());
         $this->setLayout(new DocumentLayout());
-
-        // Set empty Master & SlideLayout
-        $this->createMasterSlide()->createSlideLayout();
     }
 
     /**
@@ -259,11 +259,11 @@ public function getAllSlides()
     /**
      * Get index for slide
      *
-     * @param  \PhpOffice\PhpPresentation\Slide $slide
+     * @param  \PhpOffice\PhpPresentation\Slide\AbstractSlide $slide
      * @return int
      * @throws \Exception
      */
-    public function getIndex(Slide $slide)
+    public function getIndex(Slide\AbstractSlide $slide)
     {
         $index = null;
         foreach ($this->slideCollection as $key => $value) {
@@ -423,8 +423,23 @@ public function getZoom()
         return $this->getPresentationProperties()->getZoom();
     }
 
+    /**
+     * @return \ArrayObject|Slide\SlideMaster[]
+     */
     public function getAllMasterSlides()
     {
         return $this->slideMasters;
     }
+
+    /**
+     * @param \ArrayObject|Slide\SlideMaster[] $slideMasters
+     * @return $this
+     */
+    public function setAllMasterSlides($slideMasters = array())
+    {
+        if ($slideMasters instanceof \ArrayObject || is_array($slideMasters)) {
+            $this->slideMasters = $slideMasters;
+        }
+        return $this;
+    }
 }

src/PhpPresentation/Reader/PowerPoint2007.php

@@ -20,11 +20,9 @@
 use PhpOffice\PhpPresentation\Shape\Chart;
 use PhpOffice\PhpPresentation\Shape\RichText;
 use PhpOffice\PhpPresentation\Shape\Table;
-use PhpOffice\PhpPresentation\Slide\AbstractBackground;
 use PhpOffice\PhpPresentation\Slide\AbstractSlide;
-use PhpOffice\PhpPresentation\Slide\Layout;
 use PhpOffice\PhpPresentation\Slide\Note;
-use PhpOffice\PhpPresentation\Slide\Transition;
+use PhpOffice\PhpPresentation\Slide\SlideLayout;
 
 /**
  * Slide class
@@ -40,7 +38,7 @@ class Slide extends AbstractSlide implements ComparableInterface, ShapeContainer
     /**
      * Slide layout
      *
-     * @var string
+     * @var SlideLayout
      */
     private $slideLayout;
 
@@ -79,20 +77,16 @@ public function __construct(PhpPresentation $pParent = null)
     {
         // Set parent
         $this->parent = $pParent;
-
-        $this->slideLayout = Slide\Layout::BLANK;
-
         // Shape collection
         $this->shapeCollection = new \ArrayObject();
-
         // Set identifier
         $this->identifier = md5(rand(0, 9999) . time());
     }
 
     /**
      * Get slide layout
      *
-     * @return string
+     * @return SlideLayout
      */
     public function getSlideLayout()
     {
@@ -102,13 +96,12 @@ public function getSlideLayout()
     /**
      * Set slide layout
      *
-     * @param  string              $layout
+     * @param  SlideLayout $layout
      * @return \PhpOffice\PhpPresentation\Slide
      */
-    public function setSlideLayout($layout = Layout::BLANK)
+    public function setSlideLayout(SlideLayout $layout)
     {
         $this->slideLayout = $layout;
-
         return $this;
     }
 
@@ -225,7 +218,7 @@ public function addAnimation($animation)
     /**
      * Get collection of animations
      *
-     * @return \PhpOffice\PhpPresentation\Slide\Animation
+     * @return \PhpOffice\PhpPresentation\Slide\Animation[]
      */
     public function getAnimations()
     {

src/PhpPresentation/Slide.php

@@ -21,7 +21,7 @@
 use PhpOffice\PhpPresentation\GeometryCalculator;
 use PhpOffice\PhpPresentation\PhpPresentation;
 use PhpOffice\PhpPresentation\Shape\Chart;
-use PhpOffice\PhpPresentation\Shape\Drawing;
+use PhpOffice\PhpPresentation\Shape\Drawing\File;
 use PhpOffice\PhpPresentation\Shape\Group;
 use PhpOffice\PhpPresentation\Shape\Line;
 use PhpOffice\PhpPresentation\Shape\RichText;
@@ -31,23 +31,16 @@
 
 abstract class AbstractSlide implements ComparableInterface, ShapeContainerInterface
 {
+    /**
+     * @var string
+     */
     protected $relsIndex;
     /**
      *
      * @var \PhpOffice\PhpPresentation\Slide\Transition
      */
     protected $slideTransition;
 
-    public function getRelsIndex()
-    {
-        return $this->relsIndex;
-    }
-
-    public function setRelsIndex($indexName)
-    {
-        $this->relsIndex = $indexName;
-    }
-
     /**
      * Collection of shapes
      *
@@ -264,11 +257,11 @@ public function createChartShape()
     /**
      * Create drawing shape
      *
-     * @return \PhpOffice\PhpPresentation\Shape\Drawing
+     * @return \PhpOffice\PhpPresentation\Shape\Drawing\File
      */
     public function createDrawingShape()
     {
-        $shape = new Drawing();
+        $shape = new File();
         $this->addShape($shape);
         return $shape;
     }
@@ -358,4 +351,20 @@ public function setTransition(Transition $transition = null)
         $this->slideTransition = $transition;
         return $this;
     }
+
+    /**
+     * @return string
+     */
+    public function getRelsIndex()
+    {
+        return $this->relsIndex;
+    }
+
+    /**
+     * @param string $indexName
+     */
+    public function setRelsIndex($indexName)
+    {
+        $this->relsIndex = $indexName;
+    }
 }

src/PhpPresentation/Slide/AbstractSlide.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace PhpOffice\PhpPresentation\Slide\Background;
+
+use PhpOffice\PhpPresentation\Slide\AbstractBackground;
+use PhpOffice\PhpPresentation\Style\SchemeColor as StyleSchemeColor;
+
+class SchemeColor extends AbstractBackground
+{
+    /**
+     * @var StyleSchemeColor
+     */
+    protected $schemeColor;
+
+    /**
+     * @param StyleSchemeColor|null $color
+     * @return $this
+     */
+    public function setSchemeColor(StyleSchemeColor $color = null)
+    {
+        $this->schemeColor = $color;
+        return $this;
+    }
+
+    /**
+     * @return StyleSchemeColor
+     */
+    public function getSchemeColor()
+    {
+        return $this->schemeColor;
+    }
+}

src/PhpPresentation/Slide/Background/SchemeColor.php

@@ -18,6 +18,7 @@
 
 use PhpOffice\PhpPresentation\ComparableInterface;
 use PhpOffice\PhpPresentation\ShapeContainerInterface;
+use PhpOffice\PhpPresentation\Style\ColorMap;
 
 class SlideLayout extends AbstractSlide implements ComparableInterface, ShapeContainerInterface
 {
@@ -34,6 +35,24 @@ class SlideLayout extends AbstractSlide implements ComparableInterface, ShapeCon
      * @var int
      */
     public $layoutNr;
+    /**
+     * Slide layout ID (should not be used by user code!)
+     *
+     * @var int
+     */
+    public $layoutId;
+    /**
+     * Slide layout ID (should not be used by user code!)
+     *
+     * @var int
+     */
+    protected $layoutName;
+    /**
+     * Mapping of colors to the theme
+     *
+     * @var \PhpOffice\PhpPresentation\Style\ColorMap
+     */
+    public $colorMap;
 
     /**
      * Create a new slideLayout
@@ -48,5 +67,25 @@ public function __construct(SlideMaster $pSlideMaster)
         $this->shapeCollection = new \ArrayObject();
         // Set identifier
         $this->identifier = md5(rand(0, 9999) . time());
+        // Set a basic colorMap
+        $this->colorMap = new ColorMap();
+    }
+
+    /**
+     * @return int
+     */
+    public function getLayoutName()
+    {
+        return $this->layoutName;
+    }
+
+    /**
+     * @param int $layoutName
+     * @return SlideLayout
+     */
+    public function setLayoutName($layoutName)
+    {
+        $this->layoutName = $layoutName;
+        return $this;
     }
 }