alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Chart writing bugfixes

This commit is contained in:
Mark Baker 2012-07-20 23:53:16 +01:00
parent dd69a5a134
commit 8bcf795e16
5 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Classes/PHPExcel/Writer/Excel2007/Chart.php
View File

@ -849,7 +849,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
}
if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
$this->_writeBubbles($plotSeriesValues, $objWriter);
$this->_writeBubbles($plotSeriesValues, $objWriter, $pSheet);
}
$objWriter->endElement();
@ -975,15 +975,17 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$dataValues = $plotSeriesValues->getDataValues();
if (!empty($dataValues)) {
if (!is_array($dataValues)) {
$dataValues = PHPExcel_Calculation_Functions::flattenArray(
PHPExcel_Calculation::getInstance()
->calculateFormula('='.$dataValues,
NULL,
$pSheet->getCell('A1')
)
);
}
// if (!is_array($dataValues)) {
// echo 'NOT AN ARRAY: ';
// var_dump($dataValues);
// $dataValues = PHPExcel_Calculation_Functions::flattenArray(
// PHPExcel_Calculation::getInstance()
// ->calculateFormula('='.$dataValues,
// NULL,
// $pSheet->getCell('A1')
// )
// );
// }
if (is_array($dataValues)) {
foreach($dataValues as $plotSeriesKey => $plotSeriesValue) {
$objWriter->startElement('c:pt');
@ -1010,7 +1012,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
* @param PHPExcel_Shared_XMLWriter $objWriter XML Writer
* @throws Exception
*/
private function _writeBubbles($plotSeriesValues, $objWriter)
private function _writeBubbles($plotSeriesValues, $objWriter, PHPExcel_Worksheet $pSheet)
{
if (is_null($plotSeriesValues)) {
return;
@ -1027,7 +1029,21 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->writeAttribute('val', $plotSeriesValues->getPointCount() );
$objWriter->endElement();
foreach($plotSeriesValues->getDataValues() as $plotSeriesKey => $plotSeriesValue) {
$dataValues = $plotSeriesValues->getDataValues();
if (!empty($dataValues)) {
// if (!is_array($dataValues)) {
// echo 'NOT AN ARRAY: ';
// var_dump($dataValues);
// $dataValues = PHPExcel_Calculation_Functions::flattenArray(
// PHPExcel_Calculation::getInstance()
// ->calculateFormula('='.$dataValues,
// NULL,
// $pSheet->getCell('A1')
// )
// );
// }
if (is_array($dataValues)) {
foreach($dataValues as $plotSeriesKey => $plotSeriesValue) {
$objWriter->startElement('c:pt');
$objWriter->writeAttribute('idx', $plotSeriesKey );
$objWriter->startElement('c:v');
@ -1035,6 +1051,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement();
$objWriter->endElement();
}
}
}
$objWriter->endElement();
$objWriter->endElement();

BIN
Tests/templates/32readwriteChartColours1.xlsx
View File

Binary file not shown.

BIN
Tests/templates/32readwriteChartLegends1.xlsx
View File

Binary file not shown.

BIN
Tests/templates/32readwriteChartTypes1.xlsx
View File

Binary file not shown.

BIN
Tests/templates/32readwriteColumnChart3D2.xlsx
View File

Binary file not shown.