Merge branch 'develop' into issue179

Author: Progi1984

CHANGELOG.md

@@ -6,6 +6,24 @@
 - Fixed the image project - @mvargasmoran GH-177
 - PowerPoint2007 Writer : Bugfix for printing slide notes - @JewrassicPark GH-179
 
+### Changes
+- PhpOffice\PhpPresentation\Writer\ODPresentation : Move to Design Pattern Decorator - @Progi1984
+- PhpOffice\PhpPresentation\Writer\PowerPoint2007 : Move to Design Pattern Decorator - @Progi1984
+- PhpOffice\PhpPresentation\Shape\Type\AbstracType\getData has been deprecated for PhpOffice\PhpPresentation\Shape\Type\AbstracType\getSeries - @Progi1984 GH-169
+- PhpOffice\PhpPresentation\Shape\Type\AbstracType\setData has been deprecated for PhpOffice\PhpPresentation\Shape\Type\AbstracType\setSeries - @Progi1984 GH-169
+- Added documentation for chart series (font, outline, marker) - @Progi1984 GH-169
+
+### Features
+- ODPresentation & PowerPoint2007 Writer : Add support for Comment - @Progi1984 GH-116
+- ODPresentation & PowerPoint2007 Writer : Thumbnail of the presentation - @Progi1984 GH-125
+- ODPresentation & PowerPoint2007 Writer : Add support for Gridlines in Chart - @Progi1984 GH-129
+- ODPresentation & PowerPoint2007 Writer : Support for images in base 64 - @Progi1984 GH-168
+- ODPresentation & PowerPoint2007 Writer : Marker of Series in Line & Scatter chart is customizable - @Progi1984 GH-169
+- ODPresentation & PowerPoint2007 Writer : Outline of Series in Line & Scatter chart is customizable - @Progi1984 GH-169
+- ODPresentation & PowerPoint2007 & Serialized Writer : Support for Zip Adapter - @Progi1984 GH-176
+- ODPresentation & PowerPoint2007 Writer : language property to TextElement - @skrajewski & @Progi1984 GH-180
+- ODPresentation & PowerPoint2007 Writer : Add Font Support For Chart Axis - @jrking4 GH-186
+
 ## 0.6.0 - 2016-01-24
 
 ### Bugfix

VERSION

@@ -1 +1 @@
-0.4.0
+0.6.0

composer.json

@@ -22,7 +22,7 @@
         "php": ">=5.3.0",
         "ext-xml": "*",
         "ext-zip": "*",
-		"phpoffice/common": "0.2.*"
+        "phpoffice/common": "0.2.*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",

docs/general.rst

@@ -53,7 +53,7 @@ Document information
 --------------------
 
 You can set the document information such as title, creator, and company
-name. Use the following functions:
+name. Use the following functions :
 
 .. code-block:: php
 
@@ -69,3 +69,37 @@ name. Use the following functions:
     $properties->setSubject('My subject');
     $properties->setKeywords('my, key, word');
 
+
+Presentation Properties
+-----------------------
+
+You can define some properties which are relative to the presentation, like the zoom or the thumbnail.
+
+
+Thumbnail
+`````````
+
+You can define the thumbnail of the presentation with the method ``setThumbnailPath``.
+
+.. code-block:: php
+
+    $oPresentation = new PhpPresentation();
+    $oProperties = $oPresentation->getPresentationProperties();
+    // Set path of the thumbnail
+    $oProperties->setThumbnailPath(__DIR__.'\resources\phppowerpoint_logo.gif');
+    // Get path of the thumbnail
+    echo $oProperties->getThumbnailPath();
+
+Zoom
+````
+
+You can define the zoom of the presentation with the method ``setZoom``.
+
+.. code-block:: php
+
+    $oPresentation = new PhpPresentation();
+    $oProperties = $oPresentation->getPresentationProperties();
+    // Set zoom of the presentation (3 = 300%)
+    $oProperties->setZoom(3);
+    // Get zoom of the presentation
+    echo $oProperties->getZoom();

docs/index.rst

@@ -4,7 +4,7 @@
    contain the root `toctree` directive.
 
 Welcome to PHPPresentation's documentation
-========================================
+==========================================
 
 |PHPPresentation|
 
@@ -19,7 +19,8 @@ PHPPresentation is a library written in pure PHP that provides a set of classes
    slides
    shapes
    styles
-   writersreaders
+   writers
+   readers
    recipes
    faq
    credits
@@ -32,6 +33,8 @@ PHPPresentation is a library written in pure PHP that provides a set of classes
    :caption: Shapes
 
    shapes_chart
+   shapes_comment
+   shapes_richtext
    shapes_table
 
 Indices and tables

docs/readers.rst

@@ -0,0 +1,44 @@
+.. _writersreaders:
+
+Readers
+=======
+
+ODPresentation
+--------------
+
+The name of the reader is ``ODPresentation``.
+
+.. code-block:: php
+
+    $oWriter = IOFactory::createReader('ODPresentation');
+    $oWriter->load(__DIR__ . '/sample.odp');
+
+PowerPoint97
+------------
+
+The name of the reader is ``PowerPoint97``.
+
+.. code-block:: php
+
+    $oWriter = IOFactory::createReader('PowerPoint97');
+    $oWriter->load(__DIR__ . '/sample.ppt');
+
+PowerPoint2007
+--------------
+
+The name of the reader is ``PowerPoint2007``.
+
+.. code-block:: php
+
+    $oWriter = IOFactory::createReader('PowerPoint2007');
+    $oWriter->load(__DIR__ . '/sample.pptx');
+
+Serialized
+----------
+
+The name of the reader is ``Serialized``.
+
+.. code-block:: php
+
+    $oWriter = IOFactory::createReader('Serialized');
+    $oWriter->load(__DIR__ . '/sample.phppt');

docs/shapes.rst

@@ -30,41 +30,22 @@ Example:
 Rich text
 ---------
 
-Rich text shapes contain paragraphs of texts. To create a rich text shape, use ``createRichTextShape`` method of slide.
-
-Below are the properties that you can set for a rich text shape.
-
-- ``wrap``
-- ``autoFit``
-- ``fontScale`` : font scale (in percentage) when autoFit = RichText::AUTOFIT_NORMAL
-- ``lnSpcReduction`` : line spacing reduction (in percentage) when autoFit = RichText::AUTOFIT_NORMAL
-- ``horizontalOverflow``
-- ``verticalOverflow``
-- ``upright``
-- ``vertical``
-- ``columns``
-- ``bottomInset`` in pixels
-- ``leftInset`` in pixels
-- ``rightInset`` in pixels
-- ``topInset`` in pixels
-- ``autoShrinkHorizontal`` (boolean)
-- ``autoShrinkVertical`` (boolean)
-
-Properties that can be set for each paragraphs are as follow.
-
-- ``alignment`` see *[Alignment](#alignment)*
-- ``font`` see *[Font](#font)*
-- ``bulletStyle`` see *[Bullet](#bullet)*
+The Rich text has :ref:`its own page <shapes_richtext>`.
 
 Line
--------
+----
 
 To create a line, use `createLineShape` method of slide.
 
 Chart
+-----
+
+The Chart has :ref:`its own page <shapes_chart>`.
+
+Comment
 -------
 
-The Chart has now :ref:`its own page <shapes_chart>`. 
+The Comment has :ref:`its own page <shapes_comment>`.
 
 Drawing
 -------
@@ -79,6 +60,6 @@ To create a drawing, use `createDrawingShape` method of slide.
 		->setPath('/path/to/drawing.filename');
 		
 Table
--------
+-----
 
-The Table has now :ref:`its own page <shapes_table>`. 
+The Table has :ref:`its own page <shapes_table>`.

docs/shapes_chart.rst

@@ -9,10 +9,30 @@ Example:
 
 .. code-block:: php
 
-	$chartShape = $slide->createChartShape();
-	
+    $chartShape = $slide->createChartShape();
+
 Parts
--------
+-----
+
+Axis
+^^^^
+
+You can define gridlines (minor and major) for each axis (X & Y).
+For each gridline, you can custom the width (in points), the fill type and the fill color.
+
+.. code-block:: php
+
+    use \PhpOffice\PhpPresentation\Shape\Chart\Gridlines;
+
+    $oLine = new Line();
+
+    $oGridLines = new Gridlines();
+    $oGridLines->getOutline()->setWidth(10);
+    $oGridLines->getOutline()->getFill()->setFillType(Fill::FILL_SOLID)->setStartColor(new Color(Color::COLOR_BLUE));
+
+    $oShape = $oSlide->createChartShape();
+    $oShape->getPlotArea()->setType($oLine);
+    $oShape->getPlotArea()->getAxisX()->setMajorGridlines($oGridLines);
 
 Title
 ^^^^^
@@ -22,14 +42,56 @@ For hiding it, you define its visibility to false.
 
 .. code-block:: php
 
-	$chartShape = $slide->createChartShape();
-	$oLine = new Line();
-	$oShape->getPlotArea()->setType($oLine);
-	// Hide the title
-	$oShape->getTitle()->setVisible(false);
-	
+    $oLine = new Line();
+    $oShape = $slide->createChartShape();
+    $oShape->getPlotArea()->setType($oLine);
+    // Hide the title
+    $oShape->getTitle()->setVisible(false);
+
+Series
+^^^^^^
+
+You can custom the font of a serie.
+
+.. code-block:: php
+    $oSeries = new Series('Downloads', $seriesData);
+    // Define the size
+    $oSeries->getFont()->setSize(25);
+
+You can custom the marker of a serie, for Line & Scatter charts.
+
+.. code-block:: php
+    use \PhpOffice\PhpPresentation\Shape\Chart\Marker;
+
+    $oSeries = new Series('Downloads', $seriesData);
+    $oMarker = $oSeries->getMarker();
+    $oMarker->setSymbol(Marker::SYMBOL_DASH)->setSize(10);
+
+You can custom the line of a serie, for Line & Scatter charts.
+
+.. code-block:: php
+    use \PhpOffice\PhpPresentation\Style\Outline;
+
+    $oOutline = new Outline();
+    // Define the color
+    $oOutline->getFill()->setFillType(Fill::FILL_SOLID);
+    $oOutline->getFill()->setStartColor(new Color(Color::COLOR_YELLOW));
+    // Define the width (in points)
+    $oOutline->setWidth(2);
+
+    $oSeries = new Series('Downloads', $seriesData);
+    $oSeries->setOutline($oOutline);
+
+You can define the position of the data label.
+Each position is described in `MSDN <https://msdn.microsoft.com/en-us/library/mt459417(v=office.12).aspx>`_
+
+.. code-block:: php
+
+    $oSeries = new Series('Downloads', $seriesData);
+    $oSeries->setLabelPosition(Series::LABEL_INSIDEEND);
+
 Types
--------
+-----
 
 Area
 ^^^^
@@ -46,15 +108,15 @@ You can stack multiples series in a same chart. After adding multiples series, y
 
 .. code-block:: php
 
-	$oBarChart = new Bar();
-	$oBarChart->addSeries($oSeries1);
-	$oBarChart->addSeries($oSeries2);
-	$oBarChart->addSeries($oSeries3);
-	$oBarChart->setBarGrouping(Bar::GROUPING_CLUSTERED);
-	// OR
-	$oBarChart->setBarGrouping(Bar::GROUPING_STACKED);
-	// OR 
-	$oBarChart->setBarGrouping(Bar::GROUPING_PERCENTSTACKED);
+    $oBarChart = new Bar();
+    $oBarChart->addSeries($oSeries1);
+    $oBarChart->addSeries($oSeries2);
+    $oBarChart->addSeries($oSeries3);
+    $oBarChart->setBarGrouping(Bar::GROUPING_CLUSTERED);
+    // OR
+    $oBarChart->setBarGrouping(Bar::GROUPING_STACKED);
+    // OR
+    $oBarChart->setBarGrouping(Bar::GROUPING_PERCENTSTACKED);
 
 - Bar::GROUPING_CLUSTERED
 .. image:: images/chart_columns_52x60.png