Merge pull request #339 from Progi1984/issue218

Features from Fork

Author: Progi1984

CHANGELOG.md

@@ -18,9 +18,13 @@
 - PowerPoint97 Reader : Support of Slide Note - @Progi1984 GH-226
 - PowerPoint2007 Reader : Support of Shape Table - @Progi1984 GH-240
 - PowerPoint2007 Reader : Support of Slide Note - @Progi1984 GH-226
+- PowerPoint2007 Reader : Support text direction in Alignment for Table - @Progi1984 GH-218
 - PowerPoint2007 Writer : Implement character spacing - @jvanoostrom GH-301
 - PowerPoint2007 Writer : Axis Bounds in Chart - @Progi1984 GH-269
-- PowerPoint2007 Writer : Implement Legend Key in Series for Chart  - @Progi1984 GH-319
+- PowerPoint2007 Writer : Implement Legend Key in Series for Chart - @Progi1984 GH-319
+- PowerPoint2007 Writer : Support text direction in Alignment for Table - @SeregPie GH-218
+- PowerPoint2007 Writer : Support tick mark & unit in Axis for Chart - @Faab GH-218
+- PowerPoint2007 Writer : Support separator in Series for Chart - @jphchaput GH-218
 - Misc : Added two methods for setting Border & Fill in Legend - @Progi1984 GH-265
 
 ## 0.7.0 - 2016-09-12

docs/shapes_chart.rst

@@ -48,6 +48,34 @@ For resetting them, you pass null as parameter to these methods.
     $oShape->getPlotArea()->getAxisX()->setMinBounds(0);
     $oShape->getPlotArea()->getAxisX()->setMaxBounds(200);
 
+For Axis Y, you can define tick mark with `setMinorTickMark` & `setMajorTickMark` methods.
+For resetting them, you pass Axis::TICK_MARK_NONE as parameter to these methods.
+
+.. code-block:: php
+
+    use \PhpOffice\PhpPresentation\Shape\Chart\Axis;
+
+    $oLine = new Line();
+
+    $oShape = $oSlide->createChartShape();
+    $oShape->getPlotArea()->setType($oLine);
+    $oShape->getPlotArea()->getAxisY()->setMinorTickMark(Axis::TICK_MARK_NONE);
+    $oShape->getPlotArea()->getAxisY()->setMajorTickMark(Axis::TICK_MARK_INSIDE);
+
+For Axis Y, you can define unit with `setMinorUnit` & `setMajorUnit` methods.
+For resetting them, you pass null as parameter to these methods.
+
+.. code-block:: php
+
+    use \PhpOffice\PhpPresentation\Shape\Chart\Axis;
+
+    $oLine = new Line();
+
+    $oShape = $oSlide->createChartShape();
+    $oShape->getPlotArea()->setType($oLine);
+    $oShape->getPlotArea()->getAxisY()->setMinorUnit(null);
+    $oShape->getPlotArea()->getAxisY()->setMajorUnit(0.05);
+
 Title
 ^^^^^
 
@@ -109,6 +137,7 @@ You can define if some informations are displayed.
 .. code-block:: php
 
     $oSeries = new Series('Downloads', $seriesData);
+    $oSeries->setSeparator(';');
     $oSeries->setShowCategoryName(true);
     $oSeries->setShowLeaderLines(true);
     $oSeries->setShowLegendKey(true);

docs/shapes_table.rst

@@ -66,12 +66,25 @@ For defining margins of cell, you can use the `setMargin*` method of a Alignment
 	    ->setMarginTop(80);
 
 
+Define the text direction of a cell
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+For defining the text direction of cell, you can use the `setTextDirection` method of the `getAlignment` method of a Cell object.
+The width is in pixels.
+
+.. code-block:: php
+
+	$tableShape = $slide->createTableShape($columns);
+	$row = $tableShape->createRow();
+	$cellA1 = $row->nextCell();
+	$cellA1->getAlignment()->setTextDirection(\PhpOffice\PhpPresentation\Style\Alignment::TEXT_DIRECTION_VERTICAL_270);
+
+
 Define the width of a cell
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 The width of cells are defined by the width of cell of the first row.
 If not defined, all cells widths are calculated from the width of the shape and the number of columns.
 
-For defining the width of cell, you can use the `setWidth` method of a Cell object. 
+For defining the width of cell, you can use the `setWidth` method of a Cell object.
 The width is in pixels.
 
 .. code-block:: php

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="32" />
+            <property name="minimum" value="35" />
         </properties>
     </rule>
     <rule ref="rulesets/design.xml/NumberOfChildren">

samples/Sample_04_Table.php

@@ -79,7 +79,9 @@
 			   ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFE06B20'));
 $row->nextCell()->createTextRun('R2C1');
-$row->getCell()->getActiveParagraph()->getAlignment()->setMarginLeft(30);
+$row->getCell()->getActiveParagraph()->getAlignment()
+	->setMarginLeft(30)
+	->setTextDirection(\PhpOffice\PhpPresentation\Style\Alignment::TEXT_DIRECTION_VERTICAL_270);
 $row->nextCell()->createTextRun('R2C2');
 $row->nextCell()->createTextRun('R2C3');
 

src/PhpPresentation/Reader/PowerPoint2007.php

@@ -947,6 +947,9 @@ protected function loadShapeTable(XMLReader $document, \DOMElement $node, Abstra
                 if ($oElementTcPr instanceof \DOMElement) {
                     $numParagraphs = count($oCell->getParagraphs());
                     if ($numParagraphs > 0) {
+                        if ($oElementTcPr->hasAttribute('vert')) {
+                            $oCell->getParagraph(0)->getAlignment()->setTextDirection($oElementTcPr->getAttribute('vert'));
+                        }
                         if ($oElementTcPr->hasAttribute('anchor')) {
                             $oCell->getParagraph(0)->getAlignment()->setVertical($oElementTcPr->getAttribute('anchor'));
                         }

src/PhpPresentation/Shape/Chart/Axis.php

@@ -28,6 +28,11 @@ class Axis implements ComparableInterface
     const AXIS_X = 'x';
     const AXIS_Y = 'y';
 
+    const TICK_MARK_NONE = 'none';
+    const TICK_MARK_CROSS = 'cross';
+    const TICK_MARK_INSIDE = 'in';
+    const TICK_MARK_OUTSIDE = 'out';
+
     /**
      * Title
      *
@@ -69,6 +74,26 @@ class Axis implements ComparableInterface
      */
     protected $maxBounds;
 
+    /**
+     * @var string
+     */
+    protected $minorTickMark = self::TICK_MARK_NONE;
+
+    /**
+     * @var string
+     */
+    protected $majorTickMark = self::TICK_MARK_NONE;
+
+    /**
+     * @var float
+     */
+    protected $minorUnit;
+
+    /**
+     * @var float
+     */
+    protected $majorUnit;
+
     /**
      * Create a new \PhpOffice\PhpPresentation\Shape\Chart\Axis instance
      *
@@ -149,6 +174,42 @@ public function setFormatCode($value = '')
         return $this;
     }
 
+    /**
+     * @return int|null
+     */
+    public function getMinBounds()
+    {
+        return $this->minBounds;
+    }
+
+    /**
+     * @param int|null $minBounds
+     * @return Axis
+     */
+    public function setMinBounds($minBounds = null)
+    {
+        $this->minBounds = is_null($minBounds) ? null : (int)$minBounds;
+        return $this;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getMaxBounds()
+    {
+        return $this->maxBounds;
+    }
+
+    /**
+     * @param int|null $maxBounds
+     * @return Axis
+     */
+    public function setMaxBounds($maxBounds = null)
+    {
+        $this->maxBounds = is_null($maxBounds) ? null : (int)$maxBounds;
+        return $this;
+    }
+
     /**
      * @return Gridlines
      */
@@ -186,38 +247,74 @@ public function setMinorGridlines(Gridlines $minorGridlines)
     }
 
     /**
-     * @return int|null
+     * @return string
      */
-    public function getMinBounds()
+    public function getMinorTickMark()
     {
-        return $this->minBounds;
+        return $this->minorTickMark;
     }
 
     /**
-     * @param int|null $minBounds
+     * @param string $pTickMark
      * @return Axis
      */
-    public function setMinBounds($minBounds = null)
+    public function setMinorTickMark($pTickMark = self::TICK_MARK_NONE)
     {
-        $this->minBounds = is_null($minBounds) ? null : (int) $minBounds;
+        $this->minorTickMark = $pTickMark;
         return $this;
     }
 
     /**
-     * @return int|null
+     * @return string
      */
-    public function getMaxBounds()
+    public function getMajorTickMark()
     {
-        return $this->maxBounds;
+        return $this->majorTickMark;
     }
 
     /**
-     * @param int|null $maxBounds
+     * @param string $pTickMark
      * @return Axis
      */
-    public function setMaxBounds($maxBounds = null)
+    public function setMajorTickMark($pTickMark = self::TICK_MARK_NONE)
+    {
+        $this->majorTickMark = $pTickMark;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getMinorUnit()
+    {
+        return $this->minorUnit;
+    }
+
+    /**
+     * @param float $pUnit
+     * @return Axis
+     */
+    public function setMinorUnit($pUnit = null)
+    {
+        $this->minorUnit = $pUnit;
+        return $this;
+    }
+
+    /**
+     * @return float
+     */
+    public function getMajorUnit()
+    {
+        return $this->majorUnit;
+    }
+
+    /**
+     * @param float $pUnit
+     * @return Axis
+     */
+    public function setMajorUnit($pUnit = null)
     {
-        $this->maxBounds = is_null($maxBounds) ? null : (int) $maxBounds;
+        $this->majorUnit = $pUnit;
         return $this;
     }