Skip to content
This repository was archived by the owner on Jan 2, 2019. It is now read-only.

Chart title and axis label styling features added to 1.7.9 #202

Open
simonfi wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Chart title and axis label styling features added to 1.7.9 #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eab9a9c
Font size support in Chart Title for Excel2007
simonfi Jun 15, 2013
09c6f5f
Rich text support for Chart Axis Labels for Excel2007
simonfi Jun 15, 2013
ac0afe3
Add support for 'Tick Label Skip' in Category Axis
simonfi Jun 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions Classes/PHPExcel/Chart/DataSeriesValues.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ class PHPExcel_Chart_DataSeriesValues
*/
private $_dataValues = array();

/**
* Tick Label Skip (when this dataseries is used as a category axis in chart)
*
* @var int
*/
private $_tickLabelSkip = null;

/**
* Create a new PHPExcel_Chart_DataSeriesValues object
*/
Expand All @@ -99,6 +106,25 @@ public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSourc
$this->_marker = $marker;
}

/**
* Get Tick Label Skip (when dataseries is used as a category axis in chart)
*
* @return int
*/
public function getTickLabelSkip() {
return $this->_tickLabelSkip;
}

/**
* Set Tick Label Skip (when dataseries is used as a category axis in chart)
*
* @param int $tickLabelSkip
*/
public function setTickLabelSkip($tickLabelSkip = null)
{
$this->_tickLabelSkip = $tickLabelSkip;
}

/**
* Get Series Data Type
*
Expand Down
15 changes: 15 additions & 0 deletions Classes/PHPExcel/Chart/PlotArea.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,21 @@ public function setPlotSeries($plotSeries = array()) {
$this->_plotSeries = $plotSeries;
}

/**
* Return the first plot categories found among all plot series
*
* @return PHPExcel_Chart_DataSeriesValues
*/
public function getPlotCategories() {
foreach($this->_plotSeries as $plot)
{
$cat = $plot->getPlotCategories();
if (isset($cat[0]) && $cat[0] !== null) {
return $cat[0];
}
}
}

public function refresh(PHPExcel_Worksheet $worksheet) {
foreach($this->_plotSeries as $plotSeries) {
$plotSeries->refresh($worksheet);
Expand Down
37 changes: 17 additions & 20 deletions Classes/PHPExcel/Writer/Excel2007/Chart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,17 +449,11 @@ private function _writeCatAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAx
$objWriter->endElement();

$objWriter->startElement('a:p');
$objWriter->startElement('a:r');

$caption = $xAxisLabel->getCaption();
if (is_array($caption))
$caption = $caption[0];
$objWriter->startElement('a:t');
// $objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
$objWriter->endElement();
$caption = $xAxisLabel->getCaption();
if ((is_array($caption)) && (count($caption) > 0))
$caption = $caption[0];

$objWriter->endElement();
$this->getParentWriter()->getWriterPart('stringtable')->writeRichTextForCharts($objWriter, $caption, 'a');
$objWriter->endElement();
$objWriter->endElement();
$objWriter->endElement();
Expand Down Expand Up @@ -502,6 +496,14 @@ private function _writeCatAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAx
$objWriter->endElement();
}

$plotCategories = $plotArea->getPlotCategories();
if ($plotCategories !== null && $plotCategories->getTickLabelSkip() !== null)
{
$objWriter->startElement('c:tickLblSkip');
$objWriter->writeAttribute('val', $plotCategories->getTickLabelSkip());
$objWriter->endElement();
}

$objWriter->startElement('c:auto');
$objWriter->writeAttribute('val', 1);
$objWriter->endElement();
Expand Down Expand Up @@ -575,17 +577,12 @@ private function _writeValAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $yAx
$objWriter->endElement();

$objWriter->startElement('a:p');
$objWriter->startElement('a:r');

$caption = $yAxisLabel->getCaption();
if (is_array($caption))
$caption = $caption[0];
$objWriter->startElement('a:t');
// $objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
$objWriter->endElement();
$caption = $yAxisLabel->getCaption();
if ((is_array($caption)) && (count($caption) > 0))
$caption = $caption[0];

$this->getParentWriter()->getWriterPart('stringtable')->writeRichTextForCharts($objWriter, $caption, 'a');

$objWriter->endElement();
$objWriter->endElement();
$objWriter->endElement();
$objWriter->endElement();
Expand Down
3 changes: 3 additions & 0 deletions Classes/PHPExcel/Writer/Excel2007/StringTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,9 @@ public function writeRichTextForCharts(PHPExcel_Shared_XMLWriter $objWriter = nu
// Strikethrough
$objWriter->writeAttribute('strike', ($element->getFont()->getStrikethrough() ? 'sngStrike' : 'noStrike'));

// Size
$objWriter->writeAttribute('sz', intval($element->getFont()->getSize() * 100.0));

// rFont
$objWriter->startElement($prefix.'latin');
$objWriter->writeAttribute('typeface', $element->getFont()->getName());
Expand Down