geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-09-24 09:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to x-axis labels for chart rendering

Browse Source 
Fix to page orientation for DomPDF renderer
This commit is contained in:
Mark Baker
2012-10-10 12:31:05 +01:00
parent 49b0549885
commit 364f581ee4
6 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Classes/PHPExcel/Chart/DataSeriesValues.php
+20 -3
View File
@@ -262,7 +262,7 @@ class PHPExcel_Chart_DataSeriesValues
* FALSE - don't change the value of _dataSource
* @return PHPExcel_Chart_DataSeriesValues
*/
public function setDataValues($dataValues = array(), $refreshDataSource = true) {
public function setDataValues($dataValues = array(), $refreshDataSource = TRUE) {
$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
$this->_pointCount = count($dataValues);
@@ -277,7 +277,7 @@ class PHPExcel_Chart_DataSeriesValues
return $var !== NULL;
}
public function refresh(PHPExcel_Worksheet $worksheet) {
public function refresh(PHPExcel_Worksheet $worksheet, $flatten = TRUE) {
if ($this->_dataSource !== NULL) {
$calcEngine = PHPExcel_Calculation::getInstance();
$newDataValues = PHPExcel_Calculation::_unwrapResult(
@@ -287,9 +287,26 @@ class PHPExcel_Chart_DataSeriesValues
$worksheet->getCell('A1')
)
);
if ($flatten) {
$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
} else {
$newArray = array_values(array_shift($newDataValues));
foreach($newArray as $i => $newDataSet) {
$newArray[$i] = array($newDataSet);
}
$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
foreach($newDataValues as $newDataSet) {
$i = 0;
foreach($newDataSet as $newDataVal) {
array_unshift($newArray[$i++],$newDataVal);
}
}
$this->_dataValues = $newArray;
}
$this->_pointCount = count($this->_dataValues);
}
}
}