RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-29 08:46:03 +03:00
Code Issues Projects Releases Wiki Activity

Further chart bugfixes, plus an example of changing chart data for use in

Browse Source 
templates
This commit is contained in:
Mark Baker 2012-07-27 12:22:47 +01:00
parent b871674f18
commit 8ab0200584
4 changed files with 78 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Classes/PHPExcel/Chart/DataSeriesValues.php
View File

@ -278,12 +278,7 @@ class PHPExcel_Chart_DataSeriesValues
}
public function refresh(PHPExcel_Worksheet $worksheet) {
// echo '$this->_dataSource:',PHP_EOL;
// var_dump($this->_dataSource);
if ($this->_dataSource !== NULL) {
// echo '$this->_dataValues:',PHP_EOL;
// var_dump($this->_dataValues);
$calcEngine = PHPExcel_Calculation::getInstance();
$newDataValues = PHPExcel_Calculation::_unwrapResult(
$calcEngine->_calculateFormulaValue(
@ -293,13 +288,7 @@ class PHPExcel_Chart_DataSeriesValues
)
);
// echo '$newDataValues:',PHP_EOL;
// var_dump($newDataValues);
$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
$this->_dataValues = array_values(array_shift($newDataValues));
// $this->_dataValues = array_filter($this->_dataValues,array($this,'_stripNulls'));
// echo '$this->_dataValues:',PHP_EOL;
// var_dump($this->_dataValues);
}
}

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

@ -962,7 +962,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
($groupType != PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
($groupType != PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
if ($plotSeriesValues->getFormatCode() !== NULL) {
if (($plotSeriesValues->getFormatCode() !== NULL) &&
($plotSeriesValues->getFormatCode() !== '')) {
$objWriter->startElement('c:formatCode');
$objWriter->writeRawData( $plotSeriesValues->getFormatCode() );
$objWriter->endElement();

2
Tests/33chartcreate.php
View File

@ -28,7 +28,7 @@ date_default_timezone_set('Europe/London');
* @package PHPExcel
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version 1.7.7, 2012-05-19
* @version ##VERSION##, ##DATE##
*/
/** Include path **/

75
Tests/34chartupdate.php Normal file
View File

@ -0,0 +1,75 @@
<?php
/** Error reporting */
error_reporting(E_ALL);
date_default_timezone_set('Europe/London');
/**
* PHPExcel
*
* Copyright (C) 2006 - 2012 PHPExcel
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* @category PHPExcel
* @package PHPExcel
* @copyright Copyright (c) 2006 - 2012 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/
/** Include path **/
set_include_path(get_include_path() . PATH_SEPARATOR . '../Classes/');
/** PHPExcel */
include 'PHPExcel.php';
if (!file_exists("33chartcreate.xlsx")) {
exit("Please run 33chartcreate.php first." . PHP_EOL);
}
echo date('H:i:s') , " Load from Excel2007 file" , PHP_EOL;
$objReader = PHPExcel_IOFactory::createReader("Excel2007");
$objReader->setIncludeCharts(TRUE);
$objPHPExcel = $objReader->load("33chartcreate.xlsx");
echo date('H:i:s') , " Update cell data values that are displayed in the chart" , PHP_EOL;
$objWorksheet = $objPHPExcel->getActiveSheet();
$objWorksheet->fromArray(
array(
array(50-12, 50-15, 50-21),
array(50-56, 50-73, 50-86),
array(50-52, 50-61, 50-69),
array(50-30, 50-32, 50),
),
NULL,
'B2'
);
// Save Excel 2007 file
echo date('H:i:s') , " Write to Excel2007 format" , PHP_EOL;
$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
$objWriter->setIncludeCharts(TRUE);
$objWriter->save(str_replace('.php', '.xlsx', __FILE__));
echo date('H:i:s') , " File written to " , str_replace('.php', '.xlsx', __FILE__) , PHP_EOL;
// Echo memory peak usage
echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , PHP_EOL;
// Echo done
echo date('H:i:s') , " Done writing file" , PHP_EOL;