Fix to X-Axis labels when writing chart DataSeriesValues.php

Addition of an example for creating a radar chart

Classes/PHPExcel/Chart/DataSeriesValues.php

@@ -290,20 +290,29 @@ class PHPExcel_Chart_DataSeriesValues
 			if ($flatten) {
 				$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
 			} else {
-				$newArray = array_values(array_shift($newDataValues));
+				$cellRange = explode('!',$this->_dataSource);
-				foreach($newArray as $i => $newDataSet) {
+				if (count($cellRange) > 1) {
-					$newArray[$i] = array($newDataSet);
+					list(,$cellRange) = $cellRange;
 				}
 
-				foreach($newDataValues as $newDataSet) {
+				$dimensions = PHPExcel_Cell::rangeDimension(str_replace('$','',$cellRange));
-					$i = 0;
+				if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
-					foreach($newDataSet as $newDataVal) {
+					$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
-						array_unshift($newArray[$i++],$newDataVal);
+				} else {
+					$newArray = array_values(array_shift($newDataValues));
+					foreach($newArray as $i => $newDataSet) {
+						$newArray[$i] = array($newDataSet);
 					}
-				}
-				$this->_dataValues = $newArray;
-			}
 
+					foreach($newDataValues as $newDataSet) {
+						$i = 0;
+						foreach($newDataSet as $newDataVal) {
+							array_unshift($newArray[$i++],$newDataVal);
+						}
+					}
+					$this->_dataValues = $newArray;
+				}
+			}
 			$this->_pointCount = count($this->_dataValues);
 		}
 

Examples/33chartcreate-radar.php

@@ -0,0 +1,156 @@
+<?php
+
+/** Error reporting */
+error_reporting(E_ALL);
+ini_set('display_errors', TRUE);
+ini_set('display_startup_errors', TRUE);
+date_default_timezone_set('Europe/London');
+
+define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+
+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';
+
+$objPHPExcel = new PHPExcel();
+$objWorksheet = $objPHPExcel->getActiveSheet();
+$objWorksheet->fromArray(
+	array(
+		array('',	2010,	2011,	2012),
+		array('Jan',   47,   45,		71),
+		array('Feb',   56,   73,		86),
+		array('Mar',   52,   61,		69),
+		array('Apr',   40,   52,		60),
+		array('May',   42,   55,		71),
+		array('Jun',   58,   63,		76),
+		array('Jul',   53,   61,		89),
+		array('Aug',   46,   69,		85),
+		array('Sep',   62,   75,		81),
+		array('Oct',   51,   70,		96),
+		array('Nov',   55,   66,		89),
+		array('Dec',   68,   62,		0),
+	)
+);
+
+
+//	Set the Labels for each data series we want to plot
+//		Datatype
+//		Cell reference for data
+//		Format Code
+//		Number of datapoints in series
+//		Data values
+//		Data Marker
+$dataseriesLabels = array(
+	new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$C$1', null, 1),	//	2011
+	new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$D$1', null, 1),	//	2012
+);
+//	Set the X-Axis Labels
+//		Datatype
+//		Cell reference for data
+//		Format Code
+//		Number of datapoints in series
+//		Data values
+//		Data Marker
+$xAxisTickValues = array(
+	new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$13', null, 12),	//	Jan to Dec
+	new PHPExcel_Chart_DataSeriesValues('String', 'Worksheet!$A$2:$A$13', null, 12),	//	Jan to Dec
+);
+//	Set the Data values for each data series we want to plot
+//		Datatype
+//		Cell reference for data
+//		Format Code
+//		Number of datapoints in series
+//		Data values
+//		Data Marker
+$dataSeriesValues = array(
+	new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$C$2:$C$13', null, 12),
+	new PHPExcel_Chart_DataSeriesValues('Number', 'Worksheet!$D$2:$D$13', null, 12),
+);
+
+//	Build the dataseries
+$series = new PHPExcel_Chart_DataSeries(
+	PHPExcel_Chart_DataSeries::TYPE_RADARCHART,				// plotType
+	NULL,													// plotGrouping
+	range(0, count($dataSeriesValues)-1),					// plotOrder
+	$dataseriesLabels,										// plotLabel
+	$xAxisTickValues,										// plotCategory
+	$dataSeriesValues,										// plotValues
+	NULL,													// smooth line
+	PHPExcel_Chart_DataSeries::STYLE_MARKER					// plotStyle
+);
+
+//	Set up a layout object for the Pie chart
+$layout = new PHPExcel_Chart_Layout();
+
+//	Set the series in the plot area
+$plotarea = new PHPExcel_Chart_PlotArea($layout, array($series));
+//	Set the chart legend
+$legend = new PHPExcel_Chart_Legend(PHPExcel_Chart_Legend::POSITION_RIGHT, null, false);
+
+$title = new PHPExcel_Chart_Title('Test Radar Chart');
+
+
+//	Create the chart
+$chart = new PHPExcel_Chart(
+	'chart1',		// name
+	$title,			// title
+	$legend,		// legend
+	$plotarea,		// plotArea
+	true,			// plotVisibleOnly
+	0,				// displayBlanksAs
+	null,			// xAxisLabel
+	null			// yAxisLabel		- Radar charts don't have a Y-Axis
+);
+
+//	Set the position where the chart should appear in the worksheet
+$chart->setTopLeftPosition('F2');
+$chart->setBottomRightPosition('M15');
+
+//	Add the chart to the worksheet
+$objWorksheet->addChart($chart);
+
+
+// Save Excel 2007 file
+echo date('H:i:s') , " Write to Excel2007 format" , 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', pathinfo(__FILE__, PATHINFO_BASENAME)) , EOL;
+
+
+// Echo memory peak usage
+echo date('H:i:s') , " Peak memory usage: " , (memory_get_peak_usage(true) / 1024 / 1024) , " MB" , EOL;
+
+// Echo done
+echo date('H:i:s') , " Done writing file" , EOL;
+echo 'File has been created in ' , getcwd() , EOL;

Examples/runall.php

@@ -78,7 +78,10 @@ $aTests = array(
 	, '33chartcreate-column.php'
 	, '33chartcreate-column-2.php'
 	, '33chartcreate-line.php'
+	, '33chartcreate-pie.php'
+	, '33chartcreate-radar.php'
 	, '34chartupdate.php'
+	, '35chartrender.php'
 	, 'OOCalcReader.php'
 	, 'SylkReader.php'
 	, 'Excel2003XMLReader.php'